Merge branch 'maint-1.6.1' into maint

diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh
old mode 100644 (file)
new mode 100755 (executable)
index 3511439..e533039
--- a/t/t0024-crlf-archive.sh
+++ b/t/t0024-crlf-archive.sh
@@ -33,7 +33,7 @@ if [ $? -eq 127 ]; then
        exit
 fi
 
-test_expect_failure 'zip archive' '
+test_expect_success 'zip archive' '
 
        git archive --format=zip HEAD >test.zip &&