Merge branch 'jc/magic-pathspec'

* jc/magic-pathspec: t3703: skip more tests using colons in file names on Windows
git-mirror · Jun 7, 2011 · 8fba5f9 · 8fba5f9
2 parents 2c6b5d8 + 038e2e5
commit 8fba5f9
Showing 1 changed file with 6 additions and 6 deletions.
diff --git 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 &&