git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: steadmon@google.com
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/1] archive: init archivers before determining format
Date: Fri, 19 Oct 2018 19:59:46 -0400	[thread overview]
Message-ID: <20181019235945.GB7326@sigill.intra.peff.net> (raw)
In-Reply-To: <b1f8e288dde9a9dd46386524189da66c7ad2c333.1539990488.git.steadmon@google.com>

On Fri, Oct 19, 2018 at 04:19:28PM -0700, steadmon@google.com wrote:

> diff --git a/builtin/archive.c b/builtin/archive.c
> index e74f675390..dd3283a247 100644
> --- a/builtin/archive.c
> +++ b/builtin/archive.c
> @@ -45,7 +45,10 @@ static int run_remote_archiver(int argc, const char **argv,
>  	 * it.
>  	 */
>  	if (name_hint) {
> -		const char *format = archive_format_from_filename(name_hint);
> +		const char *format;
> +		init_tar_archiver();
> +		init_zip_archiver();
> +		format = archive_format_from_filename(name_hint);
>  		if (format)
>  			packet_write_fmt(fd[1], "argument --format=%s\n", format);

Hrm. This code was added back in 56baa61d01 (archive: move file
extension format-guessing lower, 2011-06-21), and your example
invocation worked back then!

Unfortunately it was broken by the very next patch in the series,
08716b3c11 (archive: refactor file extension format-guessing,
2011-06-21). I guess that's what I get for not adding regression tests.

It's probably worth mentioning those points in the commit message.

Does this work with configured archiver extensions, too? I think so,
because we load them via init_tar_archiver().

Can we avoid repeating the list of archivers here? This needs to stay in
sync with the list in write_archive(). I know there are only two, but
can we factor out an init_archivers() call or something?

We also should probably just call it unconditionally when we start the
archiver command (I don't think there are any other bugs like this
lurking, but it doesn't cost very much to initialize these; it makes
sense to just do it early).

Other than those minor points (and the lack of test), your fix looks
good to me.

-Peff

  reply	other threads:[~2018-10-19 23:59 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 [this message]
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
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=20181019235945.GB7326@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --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).