diff options
| author | Josh Steadmon <steadmon@google.com> | 2018-10-25 22:32:14 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-26 03:17:59 +0200 |
| commit | 00436bf1b1c2a8fe6cf5d2c2457d419d683042f4 (patch) | |
| tree | 8ebc2b31bba3bec7673287db8b4b96257df8635f /builtin/archive.c | |
| parent | Fifth batch for 2.20 (diff) | |
| download | git-00436bf1b1c2a8fe6cf5d2c2457d419d683042f4.tar.xz git-00436bf1b1c2a8fe6cf5d2c2457d419d683042f4.zip | |
archive: initialize archivers earlier
Initialize archivers as soon as possible when running git-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.
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Josh Steadmon <steadmon@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/archive.c')
| -rw-r--r-- | builtin/archive.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/archive.c b/builtin/archive.c index e74f675390..d2455237ce 100644 --- a/builtin/archive.c +++ b/builtin/archive.c @@ -97,6 +97,8 @@ int cmd_archive(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, local_opts, NULL, PARSE_OPT_KEEP_ALL); + init_archivers(); + if (output) create_output_file(output); |