From: Jeff King <peff@peff.net>
To: steadmon@google.com
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH v2] archive: initialize archivers earlier
Date: Mon, 22 Oct 2018 18:35:36 -0400 [thread overview]
Message-ID: <20181022223536.GB19019@sigill.intra.peff.net> (raw)
In-Reply-To: <bc6f20274dfe11f1451745e0accb065544cc59ca.1540244445.git.steadmon@google.com>
On Mon, Oct 22, 2018 at 02:48:11PM -0700, steadmon@google.com wrote:
> Initialize archivers as soon as possible when running git-archive and
> git-upload-archive. Various non-obvious behavior depends on having the
> archivers initialized, such as determining the desired archival format
> from the provided filename.
>
> Since 08716b3c11 ("archive: refactor file extension format-guessing",
> 2011-06-21), archive_format_from_filename() has used the registered
> archivers to match filenames (provided via --output) to archival
> formats. However, when git-archive is executed with --remote, format
> detection happens before the archivers have been registered. This causes
> archives from remotes to always be generated as TAR files, regardless of
> the actual filename (unless an explicit --format is provided).
>
> This patch fixes that behavior; archival format is determined properly
> from the output filename, even when --remote is used.
>
> Signed-off-by: Josh Steadmon <steadmon@google.com>
> Helped-by: Jeff King <peff@peff.net>
Thanks, this looks good overall.
A few minor comments (that I'm not even sure are worth re-rolling for):
> diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c
> index 25d9116356..3f35ebcfe8 100644
> --- a/builtin/upload-archive.c
> +++ b/builtin/upload-archive.c
> @@ -43,6 +43,7 @@ int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix)
> }
>
> /* parse all options sent by the client */
> + init_archivers();
> return write_archive(sent_argv.argc, sent_argv.argv, prefix,
> the_repository, NULL, 1);
> }
This seems to separate the comment from what it describes. Any reason
not to just init_archivers() closer to the top of the function here
(probably after the enter_repo() call)?
> diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
> index 2a97b27b0a..3e95fdf660 100755
> --- a/t/t5000-tar-tree.sh
> +++ b/t/t5000-tar-tree.sh
> @@ -206,6 +206,12 @@ test_expect_success 'git archive with --output, override inferred format' '
> test_cmp_bin b.tar d4.zip
> '
>
> +test_expect_success GZIP 'git archive with --output and --remote uses expected format' '
> + git archive --output=d5.tgz --remote=. HEAD &&
> + gzip -d -c < d5.tgz > d5.tar &&
> + test_cmp_bin b.tar d5.tar
> +'
This nicely tests the more-interesting tgz case. But unfortunately it
won't run on machines without the GZIP prerequisite. I'd think that
would really be _most_ machines, but is it worth having a separate zip
test to cover machines without gzip? I guess that just creates the
opposite problem: not everybody has ZIP.
-Peff
next prev parent reply other threads:[~2018-10-22 22:35 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-19 23:19 [PATCH 0/1] Fix format detection when archiving remotely steadmon
2018-10-19 23:19 ` [PATCH 1/1] archive: init archivers before determining format steadmon
2018-10-19 23:59 ` Jeff King
2018-10-22 3:24 ` Junio C Hamano
2018-10-22 21:47 ` Josh Steadmon
2018-10-22 22:30 ` Jeff King
2018-10-19 23:41 ` [PATCH 0/1] Fix format detection when archiving remotely Jeff King
2018-10-22 21:46 ` Josh Steadmon
2018-10-22 21:48 ` [PATCH v2] archive: initialize archivers earlier steadmon
2018-10-22 22:35 ` Jeff King [this message]
2018-10-22 23:51 ` Josh Steadmon
2018-10-23 0:06 ` Jeff King
2018-10-23 0:23 ` Josh Steadmon
2018-10-22 23:54 ` [PATCH v3] " steadmon
2018-10-23 0:20 ` [PATCH v4] " steadmon
2018-10-23 4:09 ` [PATCH v3] " Junio C Hamano
2018-10-25 20:29 ` Josh Steadmon
2018-10-25 20:32 ` [PATCH v5] " steadmon
2018-10-25 21:12 ` Jeff King
2018-10-26 1:14 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181022223536.GB19019@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=steadmon@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).