diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-18 11:49:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-18 11:49:17 -0700 |
| commit | 1931f6d6ea24ce6c9b5827361400d76acd627953 (patch) | |
| tree | 4ee252d7cd3d2d3d0c704e2621e759dd86cef3af | |
| parent | 288aa7534ae79eef03f79aaec355a7eedb08ddfa (diff) | |
| parent | 24676f02ba8bcf0f2c5cccd02825e15ca93bb5f4 (diff) | |
| download | git-1931f6d6ea24ce6c9b5827361400d76acd627953.tar.gz | |
Merge branch 'rs/empty-archive'
Implementations of "tar" of BSD descend have found to have trouble
with reading an otherwise empty tar archive with pax headers and
causes an unnecessary test failure.
* rs/empty-archive:
t5004: fix issue with empty archive test and bsdtar
| -rwxr-xr-x | t/t5004-archive-corner-cases.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh index cdb7d7a7f9..bfdb56a069 100755 --- a/t/t5004-archive-corner-cases.sh +++ b/t/t5004-archive-corner-cases.sh @@ -28,7 +28,7 @@ check_dir() { } test_expect_success 'tar archive of empty tree is empty' ' - git archive --format=tar HEAD >empty.tar && + git archive --format=tar HEAD: >empty.tar && make_dir extract && "$TAR" xf empty.tar -C extract && check_dir extract |