diff options
| author | Josh Steadmon <steadmon@google.com> | 2018-10-25 20:32:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-26 01:17:59 (GMT) |
| commit | 00436bf1b1c2a8fe6cf5d2c2457d419d683042f4 (patch) | |
| tree | 8ebc2b31bba3bec7673287db8b4b96257df8635f /t/t5003-archive-zip.sh | |
| parent | c4df23f7927d8d00e666a3c8d1b3375f1dc8a3c1 (diff) | |
| download | git-00436bf1b1c2a8fe6cf5d2c2457d419d683042f4.zip git-00436bf1b1c2a8fe6cf5d2c2457d419d683042f4.tar.gz git-00436bf1b1c2a8fe6cf5d2c2457d419d683042f4.tar.bz2 | |
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 't/t5003-archive-zip.sh')
| -rwxr-xr-x | t/t5003-archive-zip.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh index 55c7870..106eddb 100755 --- a/t/t5003-archive-zip.sh +++ b/t/t5003-archive-zip.sh @@ -158,11 +158,16 @@ test_expect_success 'git archive --format=zip with --output' \ 'git archive --format=zip --output=d2.zip HEAD && test_cmp_bin d.zip d2.zip' -test_expect_success 'git archive with --output, inferring format' ' +test_expect_success 'git archive with --output, inferring format (local)' ' git archive --output=d3.zip HEAD && test_cmp_bin d.zip d3.zip ' +test_expect_success 'git archive with --output, inferring format (remote)' ' + git archive --remote=. --output=d4.zip HEAD && + test_cmp_bin d.zip d4.zip +' + test_expect_success \ 'git archive --format=zip with prefix' \ 'git archive --format=zip --prefix=prefix/ HEAD >e.zip' |