From: Junio C Hamano Date: Mon, 09 Nov 2026 20:45:34 GMT Subject: Re: [PATCH 2/2] archive: remove USE_THE_REPOSITORY_VARIABLE from archival modules Message-ID: In-Reply-To: "Srujith A Poojary via GitGitGadget" writes: > diff --git a/archive-tar.c b/archive-tar.c > diff --git a/archive-zip.c b/archive-zip.c > diff --git a/archive.c b/archive.c > diff --git a/archive.h b/archive.h > index bbe65ba0f9..8ec59b22e9 100644 > --- a/archive.h > +++ b/archive.h > @@ -48,9 +48,9 @@ struct archiver { > }; > void register_archiver(struct archiver *); > > -void init_tar_archiver(void); > -void init_zip_archiver(void); > -void init_archivers(void); > +void init_tar_archiver(struct repository *repo); > +void init_zip_archiver(struct repository *repo); > +void init_archivers(struct repository *repo); > > typedef int (*write_archive_entry_fn_t)(struct archiver_args *args, > const struct object_id *oid, All of the above is straight-forward. Pass a single "repo" parameter throughout the callchain and you are done. > diff --git a/builtin/archive.c b/builtin/archive.c > index 3c1288a123..e35b9637ce 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" > @@ -97,7 +98,7 @@ int cmd_archive(int argc, > argc = parse_options(argc, argv, prefix, local_opts, NULL, > PARSE_OPT_KEEP_ALL); > > - init_archivers(); > + init_archivers(the_repository); This looks curious. When would the parameter "repo" an invalid repository (due to RUN_SETUP_GENTLY defined for "archive" entry in git.c:commands[]), yet using the_repository is a reasonable choice? > diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c > index 718e74b3ac..3cfc7ffaf3 100644 > --- a/builtin/upload-archive.c > +++ b/builtin/upload-archive.c > @@ -34,7 +34,7 @@ int cmd_upload_archive_writer(int argc, > if (!enter_repo(the_repository, argv[1], 0)) > die("'%s' does not appear to be a git repository", argv[1]); > > - init_archivers(); > + init_archivers(the_repository); It is correct to use the_repository here, the same repository we used for the enter_repo() call that immediately comes before this step.