t5004: fix issue with empty archive test and bsdtar
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>
Wed, 10 Apr 2013 17:00:20 +0000 (19:00 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Apr 2013 19:26:14 +0000 (12:26 -0700)
bsdtar, which is the default tar on Mac OS X, handles empty archives
just fine but reports archives containing only a pax extended header
comment as damaged. Work around the issue by explicitly generating
the archive for the tree and not the commit, which causes git archive
to omit the commit hash comment record from the tar file.

Reported-by: BJ Hargrave <bj@bjhargrave.com>
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t5004-archive-corner-cases.sh
index cdb7d7a7f9b59678e4079c61ae5104db51dc05a2..bfdb56a0694db0c6ed07aaa568c648909ac62660 100755 (executable)
@@ -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