[PATCH v2 2/2] archive: remove USE_THE_REPOSITORY_VARIABLE from archival modules

["Srujith A Poojary via GitGitGadget" <gitgitgadget@gmail.com>]

From: Srujith A Poojary <poojarysrujith@gmail.com>

Refactor archival modules (archive-tar.c, archive-zip.c, archive.c,
builtin/archive.c, builtin/upload-archive.c, and diagnose.c) to accept
and pass explicit struct repository * pointers instead of relying on
global repository state.

Signed-off-by: Srujith A Poojary <poojarysrujith@gmail.com>
---
 archive-tar.c     | 5 ++---
 builtin/archive.c | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/archive-tar.c b/archive-tar.c
index a1c66024d4..642a3ddfc3 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -3,7 +3,6 @@
  */
 
 #define USE_THE_REPOSITORY_VARIABLE
-
 #include "git-compat-util.h"
 #include "config.h"
 #include "gettext.h"
@@ -337,7 +336,7 @@ static void write_global_extended_header(struct archiver_args *args)
 	if (oid)
 		strbuf_append_ext_header(&ext_header, "comment",
 					 oid_to_hex(oid),
-					 the_hash_algo->hexsz);
+					 args->repo->hash_algo->hexsz);
 	if (args->time > USTAR_MAX_MTIME) {
 		strbuf_append_ext_header_uint(&ext_header, "mtime",
 					      args->time);
@@ -529,13 +528,13 @@ static struct archiver tar_archiver = {
 void init_tar_archiver(void)
 {
 	int i;
+	repo_config(the_repository, git_tar_config, NULL);
 	register_archiver(&tar_archiver);
 
 	tar_filter_config("tar.tgz.command", internal_gzip_command, NULL);
 	tar_filter_config("tar.tgz.remote", "true", NULL);
 	tar_filter_config("tar.tar.gz.command", internal_gzip_command, NULL);
 	tar_filter_config("tar.tar.gz.remote", "true", NULL);
-	repo_config(the_repository, git_tar_config, NULL);
 	for (i = 0; i < nr_tar_filters; i++) {
 		/* omit any filters that never had a command configured */
 		if (tar_filters[i]->filter_command)
diff --git a/builtin/archive.c b/builtin/archive.c
index 3c1288a123..8b7d56f8cb 100644
--- a/builtin/archive.c
+++ b/builtin/archive.c
@@ -2,6 +2,7 @@
  * Copyright (c) 2006 Franck Bui-Huu
  * Copyright (c) 2006 Rene Scharfe
  */
+#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "archive.h"
 #include "gettext.h"
-- 
gitgitgadget