Merge branch 'jc/magic-pathspec'

* jc/magic-pathspec:
  t3703: skip more tests using colons in file names on Windows

diff --git a/t/t3703-add-magic-pathspec.sh b/t/t3703-add-magic-pathspec.sh
index e508246c0c904ec01775040d9fb0cc32b4b33dc2..5115de7036c38a9464dfdab0e13519a872902991 100755 (executable)
--- a/t/t3703-add-magic-pathspec.sh
+++ b/t/t3703-add-magic-pathspec.sh
@@ -38,17 +38,17 @@ cat >expected <<EOF
 add 'sub/foo'
 EOF
 
-test_expect_success 'a file with the same (long) magic name exists' '
-       : >":(icase)ha" &&
-       test_must_fail git add -n ":(icase)ha" &&
-       git add -n "./:(icase)ha"
-'
-
 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 COLON_DIR 'a file with the same (short) magic name exists' '
        : >":/bar" &&
        test_must_fail git add -n :/bar &&