Merge branch 'gc/http-with-non-ascii-username-url'

diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh
index e5330395fc866b2a913b4b20ecb66f1f2a3bbaff..ec6c1b3f8a7eac0e1734883a0ad2f2d68f11bf96 100755 (executable)
--- a/t/t0024-crlf-archive.sh
+++ b/t/t0024-crlf-archive.sh
@@ -7,7 +7,7 @@ UNZIP=${UNZIP:-unzip}
 
 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,7 +20,7 @@ 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
 
@@ -28,12 +28,12 @@ test_expect_success 'tar archive' '
 
 "$UNZIP" -v >/dev/null 2>&1
 if [ $? -eq 127 ]; then
-       echo "Skipping ZIP test, because unzip was not found"
-       test_done
-       exit
+       say "Skipping ZIP test, because unzip was not found"
+else
+       test_set_prereq UNZIP
 fi
 
-test_expect_success 'zip archive' '
+test_expect_success UNZIP 'zip archive' '
 
        git archive --format=zip HEAD >test.zip &&