mirror of
https://github.com/git/git
synced 2024-10-28 19:25:47 +00:00
Merge branch 'jk/grep-e-could-be-extended-beyond-posix' into maint
Tighten a test to avoid mistaking an extended ERE regexp engine as a PRE regexp engine. * jk/grep-e-could-be-extended-beyond-posix: t7810: avoid assumption about invalid regex syntax
This commit is contained in:
commit
14beee0d0d
1 changed files with 15 additions and 11 deletions
|
@ -39,6 +39,10 @@ test_expect_success setup '
|
|||
echo "a+bc"
|
||||
echo "abc"
|
||||
} >ab &&
|
||||
{
|
||||
echo d &&
|
||||
echo 0
|
||||
} >d0 &&
|
||||
echo vvv >v &&
|
||||
echo ww w >w &&
|
||||
echo x x xx x >x &&
|
||||
|
@ -1105,36 +1109,36 @@ test_expect_success 'grep pattern with grep.patternType=fixed, =basic, =extended
|
|||
'
|
||||
|
||||
test_expect_success 'grep -G -F -P -E pattern' '
|
||||
>empty &&
|
||||
test_must_fail git grep -G -F -P -E "a\x{2b}b\x{2a}c" ab >actual &&
|
||||
test_cmp empty actual
|
||||
echo "d0:d" >expected &&
|
||||
git grep -G -F -P -E "[\d]" d0 >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'grep pattern with grep.patternType=fixed, =basic, =perl, =extended' '
|
||||
>empty &&
|
||||
test_must_fail git \
|
||||
echo "d0:d" >expected &&
|
||||
git \
|
||||
-c grep.patterntype=fixed \
|
||||
-c grep.patterntype=basic \
|
||||
-c grep.patterntype=perl \
|
||||
-c grep.patterntype=extended \
|
||||
grep "a\x{2b}b\x{2a}c" ab >actual &&
|
||||
test_cmp empty actual
|
||||
grep "[\d]" d0 >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success LIBPCRE 'grep -G -F -E -P pattern' '
|
||||
echo "ab:a+b*c" >expected &&
|
||||
git grep -G -F -E -P "a\x{2b}b\x{2a}c" ab >actual &&
|
||||
echo "d0:0" >expected &&
|
||||
git grep -G -F -E -P "[\d]" d0 >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success LIBPCRE 'grep pattern with grep.patternType=fixed, =basic, =extended, =perl' '
|
||||
echo "ab:a+b*c" >expected &&
|
||||
echo "d0:0" >expected &&
|
||||
git \
|
||||
-c grep.patterntype=fixed \
|
||||
-c grep.patterntype=basic \
|
||||
-c grep.patterntype=extended \
|
||||
-c grep.patterntype=perl \
|
||||
grep "a\x{2b}b\x{2a}c" ab >actual &&
|
||||
grep "[\d]" d0 >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue