diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-06-07 08:32:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-07 08:32:42 -0700 |
| commit | 8fba5f985263efd46e94f392ce618de6adc1c3d5 (patch) | |
| tree | c73eee74749cd048c2f22844138011bfa07d41f4 | |
| parent | Merge branch 'jn/mime-type-with-params' (diff) | |
| parent | t3703: skip more tests using colons in file names on Windows (diff) | |
| download | tgif-8fba5f985263efd46e94f392ce618de6adc1c3d5.tar.xz | |
Merge branch 'jc/magic-pathspec'
* jc/magic-pathspec:
t3703: skip more tests using colons in file names on Windows
| -rwxr-xr-x | t/t3703-add-magic-pathspec.sh | 12 |
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 && |