Merge branch 'nd/clone-no-separate-git-dir-with-bare'

diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh
index c7d0324374e9df5131a58a9ae0cadf7ee4dc03e7..5378787e1b23bf18796c28c33533f677b389289c 100755 (executable)
--- a/t/t0024-crlf-archive.sh
+++ b/t/t0024-crlf-archive.sh
@@ -3,11 +3,16 @@
 test_description='respect crlf in git archive'
 
 . ./test-lib.sh
-UNZIP=${UNZIP:-unzip}
+GIT_UNZIP=${GIT_UNZIP:-unzip}
+
+test_lazy_prereq UNZIP '
+       "$GIT_UNZIP" -v
+       test $? -ne 127
+'
 
 test_expect_success setup '
 
-       git config core.autocrlf true
+       git config core.autocrlf true &&
 
        printf "CRLF line ending\r\nAnd another\r\n" > sample &&
        git add sample &&
@@ -20,24 +25,17 @@ test_expect_success setup '
 test_expect_success 'tar archive' '
 
        git archive --format=tar HEAD |
-       ( mkdir untarred && cd untarred && "$TAR" -xf - )
+       ( mkdir untarred && cd untarred && "$TAR" -xf - ) &&
 
        test_cmp sample untarred/sample
 
 '
 
-"$UNZIP" -v >/dev/null 2>&1
-if [ $? -eq 127 ]; then
-       say "Skipping ZIP test, because unzip was not found"
-else
-       test_set_prereq UNZIP
-fi
-
 test_expect_success UNZIP 'zip archive' '
 
        git archive --format=zip HEAD >test.zip &&
 
-       ( mkdir unzipped && cd unzipped && unzip ../test.zip ) &&
+       ( mkdir unzipped && cd unzipped && "$GIT_UNZIP" ../test.zip ) &&
 
        test_cmp sample unzipped/sample