Skip to content

Commit

Permalink
Merge branch 'jc/magic-pathspec'
Browse files Browse the repository at this point in the history
* jc/magic-pathspec:
  t3703: skip more tests using colons in file names on Windows
  • Loading branch information
Junio C Hamano committed Jun 7, 2011
2 parents 2c6b5d8 + 038e2e5 commit 8fba5f9
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions t/t3703-add-magic-pathspec.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down

0 comments on commit 8fba5f9

Please sign in to comment.