Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile

diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh
index cdb7d7a7f9b59678e4079c61ae5104db51dc05a2..8d1bbd356ac9a22021db0cdbd14544fbcf3c9246 100755 (executable)
--- 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
+       git archive --format=tar HEAD: >empty.tar &&
+       perl -e "print \"\\0\" x 10240" >10knuls.tar &&
+       test_cmp 10knuls.tar empty.tar
 '
 
 test_expect_success 'tar archive of empty tree with prefix' '