Test 2 of t5004 checks if a supposedly empty tar archive really
contains no files.  24676f02 (t5004: fix issue with empty archive test
and bsdtar) removed our commit hash to make it work with bsdtar, but
the test still fails on NetBSD and OpenBSD, which use their own tar
that considers a tar file containing only NULs as broken.

Here's what the different archivers do when asked to create a tar
file without entries:

        $ uname -v
        NetBSD 6.0.1 (GENERIC)
        $ gtar --version | head -1
        tar (GNU tar) 1.26
        $ bsdtar --version
        bsdtar 2.8.4 - libarchive 2.8.4

        $ : >zero.tar
        $ perl -e 'print "\0" x 10240' >tenk.tar
        $ sha1 zero.tar tenk.tar
        SHA1 (zero.tar) = da39a3ee5e6b4b0d3255bfef95601890afd80709
        SHA1 (tenk.tar) = 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c

        $ : | tar cf - -T - | sha1
        $ : | gtar cf - -T - | sha1
        $ : | bsdtar cf - -T - | sha1

So NetBSD's native tar creates an empty file, while GNU tar and bsdtar
both give us 10KB of NULs -- just like git archive with an empty tree.
Now let's see how the archivers handle these two kinds of empty tar
        $ tar tf zero.tar; echo $?
        tar: Unexpected EOF on archive file
        $ gtar tf zero.tar; echo $?
        gtar: This does not look like a tar archive
        gtar: Exiting with failure status due to previous errors
        $ bsdtar tf zero.tar; echo $?

        $ tar tf tenk.tar; echo $?
        tar: Cannot identify format. Searching...
        tar: End of archive volume 1 reached
        tar: Sorry, unable to determine archive format.
        $ gtar tf tenk.tar; echo $?
        $ bsdtar tf tenk.tar; echo $?

NetBSD's tar complains about both, bsdtar happily accepts any of them
and GNU tar doesn't like zero-length archive files.  So the safest
course of action is to stay with our block-of-NULs format which is
compatible with GNU tar and bsdtar, as we can't make NetBSD's native
tar happy anyway.

We can simplify our test, however, by taking tar out of the picture.
Instead of extracting the archive and checking for the non-presence of
files, check if the file has a size of 10KB and contains only NULs.
This makes t5004 pass on NetBSD and OpenBSD.

Signed-off-by: Rene Scharfe <rene.scha...@lsrfire.ath.cx>
Fixes a failure of a test added after v1.8.2.

 t/t5004-archive-corner-cases.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh
index ddf6e35..8d1bbd3 100755
--- a/t/t5004-archive-corner-cases.sh
+++ b/t/t5004-archive-corner-cases.sh
@@ -29,9 +29,8 @@ check_dir() {
 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' '

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to