summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2011-06-07 11:49:44 +0200
committerJunio C Hamano <gitster@pobox.com>2011-06-07 08:32:14 -0700
commit038e2e5656b13058bc9596ef44647e190e96e493 (patch)
tree731d891209e49f24dd96c60ffc999f1822935d65
parent488201c87e284ae06323b534c31e354811fb0d51 (diff)
downloadgit-038e2e5656b13058bc9596ef44647e190e96e493.tar.gz
t3703: skip more tests using colons in file names on Windows
Use the same test and prerequisite as introduced in similar fix in 650af7ae8bdf92bd92df2. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-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 e508246c0c..5115de7036 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 &&