Merge branch 'rj/t6137-cygwin-fix'

Test fix for breakage introduced in Git 2.50.

* rj/t6137-cygwin-fix:
  t6137-*.sh: fix test failure on cygwin
maint
Junio C Hamano 2025-08-21 13:47:01 -07:00
commit 9e99f0e4ef
1 changed files with 6 additions and 6 deletions

View File

@ -3,8 +3,8 @@ test_description='test wildcards and literals with git add/commit (subshell styl


. ./test-lib.sh . ./test-lib.sh


test_have_prereq FUNNYNAMES || { test_have_prereq BSLASHPSPEC || {
skip_all='skipping: needs FUNNYNAMES (non-Windows only)' skip_all='skipping: needs BSLASHPSPEC (backslashes in pathspecs)'
test_done test_done
} }


@ -184,7 +184,7 @@ test_expect_success 'add wildcard f?z' '
) )
' '


test_expect_success 'add literal \? literal' ' test_expect_success 'add literal \?' '
git init test-q-lit && git init test-q-lit &&
( (
cd test-q-lit && cd test-q-lit &&
@ -241,7 +241,7 @@ test_expect_success 'add literal hello\?world' '
) )
' '


test_expect_success 'add literal [abc]' ' test_expect_success 'add literal \[abc\]' '
git init test-brackets-lit && git init test-brackets-lit &&
( (
cd test-brackets-lit && cd test-brackets-lit &&
@ -280,7 +280,7 @@ test_expect_success 'commit: wildcard *' '
) )
' '


test_expect_success 'commit: literal *' ' test_expect_success 'commit: literal \*' '
git init test-c-asterisk-lit && git init test-c-asterisk-lit &&
( (
cd test-c-asterisk-lit && cd test-c-asterisk-lit &&
@ -328,7 +328,7 @@ test_expect_success 'commit: literal f\*' '
) )
' '


test_expect_success 'commit: wildcard pathspec limits commit' ' test_expect_success 'commit: wildcard f**' '
git init test-c-pathlimit && git init test-c-pathlimit &&
( (
cd test-c-pathlimit && cd test-c-pathlimit &&