diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-05-09 13:32:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-09 13:32:54 -0700 |
| commit | b387c77b12953d543bf5efc3825b5be26d753f9c (patch) | |
| tree | 0b79d31d5f8b95c37eb9178152798a2f1aef71f1 /t | |
| parent | Merge branch 'mv/sequencer-pick-error-diag' (diff) | |
| parent | Git 1.8.2.3 (diff) | |
| download | tgif-b387c77b12953d543bf5efc3825b5be26d753f9c.tar.xz | |
Sync with v1.8.2.3
* maint:
Git 1.8.2.3
t5004: avoid using tar for checking emptiness of archive
t5004: ignore pax global header file
mergetools/kdiff3: do not use --auto when diffing
transport-helper: trivial style cleanup
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5004-archive-corner-cases.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh index bfdb56a069..8d1bbd356a 100755 --- a/t/t5004-archive-corner-cases.sh +++ b/t/t5004-archive-corner-cases.sh @@ -23,15 +23,14 @@ check_dir() { echo "$dir/$i" done } | sort >expect && - find "$dir" -print | sort >actual && + find "$dir" ! -name pax_global_header -print | sort >actual && test_cmp expect actual } test_expect_success 'tar archive of empty tree is empty' ' git archive --format=tar HEAD: >empty.tar && - make_dir extract && - "$TAR" xf empty.tar -C extract && - check_dir extract + perl -e "print \"\\0\" x 10240" >10knuls.tar && + test_cmp 10knuls.tar empty.tar ' test_expect_success 'tar archive of empty tree with prefix' ' |