git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2] archive: initialize archivers earlier

From
Jeff King <peff@peff.net>
Date
Oct 22, 2018, 22:35 UTC
Message-ID
<20181022223536.GB19019@sigill.intra.peff.net>
In-Reply-To
<bc6f20274dfe11f1451745e0accb065544cc59ca.1540244445.git.steadmon@google.com>
On Mon, Oct 22, 2018 at 02:48:11PM -0700, steadmon@google.com wrote:
Show 18 quoted lines
> 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):
Show 12 quoted lines
> 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)?

Show 13 quoted lines
> 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
Previous: steadmon@google.comNext: Josh Steadmon
Message 10 of 20 in “Fix format detection when archiving remotely”
  1. 0/1 Fix format detection when archiving remotelysteadmon@google.com, Oct 19, 2018
  2. 1/1 archive: init archivers before determining formatsteadmon@google.com, Oct 19, 2018
  3. Jeff KingOct 19, 2018
  4. Junio C HamanoOct 22, 2018
  5. Josh SteadmonOct 22, 2018
  6. Jeff KingOct 22, 2018
  7. Jeff KingOct 19, 2018
  8. Josh SteadmonOct 22, 2018
  9. archive: initialize archivers earliersteadmon@google.com, Oct 22, 2018
  10. Jeff KingOct 22, 2018
  11. Josh SteadmonOct 22, 2018
  12. Jeff KingOct 23, 2018
  13. Josh SteadmonOct 23, 2018
  14. archive: initialize archivers earliersteadmon@google.com, Oct 22, 2018
  15. archive: initialize archivers earliersteadmon@google.com, Oct 23, 2018
  16. Junio C HamanoOct 23, 2018
  17. Josh SteadmonOct 25, 2018
  18. archive: initialize archivers earliersteadmon@google.com, Oct 25, 2018
  19. Jeff KingOct 25, 2018
  20. Junio C HamanoOct 26, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.