summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-07 15:32:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-07 15:32:42 (GMT)
commit8fba5f985263efd46e94f392ce618de6adc1c3d5 (patch)
treec73eee74749cd048c2f22844138011bfa07d41f4
parent2c6b5d88287689e5a1acd5b5fefb8edd96931b6d (diff)
parent038e2e5656b13058bc9596ef44647e190e96e493 (diff)
downloadgit-8fba5f985263efd46e94f392ce618de6adc1c3d5.zip
git-8fba5f985263efd46e94f392ce618de6adc1c3d5.tar.gz
git-8fba5f985263efd46e94f392ce618de6adc1c3d5.tar.bz2
Merge branch 'jc/magic-pathspec'
* jc/magic-pathspec: t3703: skip more tests using colons in file names on Windows
-rwxr-xr-xt/t3703-add-magic-pathspec.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t3703-add-magic-pathspec.sh b/t/t3703-add-magic-pathspec.sh
index e508246..5115de7 100755
--- 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 &&