Merge branch 'cb/doc-fetch-pull-merge'

diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh
old mode 100644 (file)
new mode 100755 (executable)
index e533039..c7d0324
--- a/t/t0024-crlf-archive.sh
+++ b/t/t0024-crlf-archive.sh
@@ -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 &&