Merge branch 'rs/empty-archive' into maint

* rs/empty-archive:
t5004: fix issue with empty archive test and bsdtar

diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh
index cdb7d7a7f9b59678e4079c61ae5104db51dc05a2..bfdb56a0694db0c6ed07aaa568c648909ac62660 100755 (executable)
--- 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