summaryrefslogtreecommitdiff
path: root/t/t5000-tar-tree.sh
diff options
context:
space:
mode:
authorJosh Steadmon <steadmon@google.com>2018-10-25 20:32:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-26 01:17:59 (GMT)
commit00436bf1b1c2a8fe6cf5d2c2457d419d683042f4 (patch)
tree8ebc2b31bba3bec7673287db8b4b96257df8635f /t/t5000-tar-tree.sh
parentc4df23f7927d8d00e666a3c8d1b3375f1dc8a3c1 (diff)
downloadgit-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/t5000-tar-tree.sh')
-rwxr-xr-xt/t5000-tar-tree.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 2a97b27..602bfd9 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 creates .tgz' '
+ git archive --output=d5.tgz --remote=. HEAD &&
+ gzip -d -c <d5.tgz >d5.tar &&
+ test_cmp_bin b.tar d5.tar
+'
+
test_expect_success 'git archive --list outside of a git repo' '
nongit git archive --list
'