X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft0024-crlf-archive.sh;h=c7d0324374e9df5131a58a9ae0cadf7ee4dc03e7;hb=0b0cd0e0a29a139f418991dd769ea4266ffec370;hp=e5330395fc866b2a913b4b20ecb66f1f2a3bbaff;hpb=7d4e3a72fb2d544b4a7cfd75f8626532d78fd726;p=git.git

diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh
index e5330395f..ec6c1b3f8 100755
--- 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 &&