From: René Scharfe Date: Wed, 10 Apr 2013 17:00:20 +0000 (+0200) Subject: t5004: fix issue with empty archive test and bsdtar X-Git-Tag: v1.8.2.2~7^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/24676f02ba8bcf0f2c5cccd02825e15ca93bb5f4 t5004: fix issue with empty archive test and bsdtar 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 Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- 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