Merge branch 'maint' into ef/ipv4-connect-error-report

diff --git a/t/t3703-add-magic-pathspec.sh b/t/t3703-add-magic-pathspec.sh
index ce5585ebb173834e629ea650db907840916917d7..5115de7036c38a9464dfdab0e13519a872902991 100755 (executable)
--- a/t/t3703-add-magic-pathspec.sh
+++ b/t/t3703-add-magic-pathspec.sh
@@ -38,14 +38,18 @@ cat >expected <<EOF
 add 'sub/foo'
 EOF
 
-test_expect_success 'a file with the same (long) magic name exists' '
+if mkdir ":" 2>/dev/null
+then
+       test_set_prereq COLON_DIR
+fi
+
+test_expect_success COLON_DIR 'a file with the same (long) magic name exists' '
        : >":(icase)ha" &&
        test_must_fail git add -n ":(icase)ha" &&
        git add -n "./:(icase)ha"
 '
 
-test_expect_success 'a file with the same (short) magic name exists' '
-       mkdir ":" &&
+test_expect_success COLON_DIR 'a file with the same (short) magic name exists' '
        : >":/bar" &&
        test_must_fail git add -n :/bar &&
        git add -n "./:/bar"