diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-02-07 15:52:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-07 15:52:12 -0800 |
| commit | e7ec9de67639d7c1715b450f54d297cc38e25867 (patch) | |
| tree | 2cd108fb5e3e836f39872a52d810a84b43f2bcf7 /t | |
| parent | Fix invalid read in quote_c_style_counted (diff) | |
| parent | archive: simplify archive format guessing (diff) | |
| download | tgif-e7ec9de67639d7c1715b450f54d297cc38e25867.tar.xz | |
Merge branch 'maint'
* maint:
archive: simplify archive format guessing
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5000-tar-tree.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 0037f63d91..27bfba55bd 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -189,6 +189,16 @@ test_expect_success 'git archive --format=zip with --output' \ 'git archive --format=zip --output=d2.zip HEAD && test_cmp d.zip d2.zip' +test_expect_success 'git archive with --output, inferring format' ' + git archive --output=d3.zip HEAD && + test_cmp d.zip d3.zip +' + +test_expect_success 'git archive with --output, override inferred format' ' + git archive --format=tar --output=d4.zip HEAD && + test_cmp b.tar d4.zip +' + $UNZIP -v >/dev/null 2>&1 if [ $? -eq 127 ]; then say "Skipping ZIP tests, because unzip was not found" |