Re: [PATCH v3 2/2] archive: remove USE_THE_REPOSITORY_VARIABLE from archival modules
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 10, 2026, 20:40 UTC
- Message-ID
- <xmqqse18pgin.fsf@gitster.g>
- In-Reply-To
- <398b54f00a1278f22fef456384c6c4ebd1a1f576.1794335969.git.gitgitgadget@gmail.com>
"Srujith A Poojary via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 10 quoted lines
> From: Srujith A Poojary <poojarysrujith@gmail.com> > > Refactor archive-tar.c, archive-zip.c, archive.c, and supporting files > to clean up archiver initialization functions and header dependencies. > > Signed-off-by: Srujith A Poojary <poojarysrujith@gmail.com> > --- > archive-tar.c | 5 ++--- > builtin/archive.c | 1 + > 2 files changed, 3 insertions(+), 3 deletions(-)
Where is the change to archive-zip.c the proposed log message advertises?
The proposed log message claims that it refactors and cleans up, but the patch looks like a totally incoherent and unexplained mess. All the places I note "What is this change about?" are unexplained changes whose value is dubious.
Show 12 quoted lines
> 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"
What is this change about?
Show 9 quoted lines
> @@ -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);Here, the args->repo which was relayed by archive.c:write_archive() is used. This function, when called by builtin/archive.c, passes the repo it obtained from git.c's dispatcher; when it is called by builtin/upload-archive.c, it uses the_repository (which is fine).
This hunk looks like a good change.
Show 15 quoted lines
> @@ -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)What is this change about? Earlier, we first declared the built-in default configurations and then read from the configuration files. Now you read the configuration files, and then overwrite the values the configuration files specified with our built-in default?
Show 12 quoted lines
> 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"
What is this change about?