Skip to content

Commit 8fba5f9

Browse files
committed
Merge branch 'jc/magic-pathspec'
* jc/magic-pathspec: t3703: skip more tests using colons in file names on Windows
2 parents 2c6b5d8 + 038e2e5 commit 8fba5f9

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

t/t3703-add-magic-pathspec.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ cat >expected <<EOF
3838
add 'sub/foo'
3939
EOF
4040

41-
test_expect_success 'a file with the same (long) magic name exists' '
42-
: >":(icase)ha" &&
43-
test_must_fail git add -n ":(icase)ha" &&
44-
git add -n "./:(icase)ha"
45-
'
46-
4741
if mkdir ":" 2>/dev/null
4842
then
4943
test_set_prereq COLON_DIR
5044
fi
5145

46+
test_expect_success COLON_DIR 'a file with the same (long) magic name exists' '
47+
: >":(icase)ha" &&
48+
test_must_fail git add -n ":(icase)ha" &&
49+
git add -n "./:(icase)ha"
50+
'
51+
5252
test_expect_success COLON_DIR 'a file with the same (short) magic name exists' '
5353
: >":/bar" &&
5454
test_must_fail git add -n :/bar &&

0 commit comments

Comments
 (0)