grep: add a test asserting that --perl-regexp dies when !PCRE
Add a test asserting that when --perl-regexp (and -P for grep) is given to git-grep & git-log that we die with an error. In developing the PCRE v2 series I introduced a regression where -P would (through control-flow fall-through) become synonymous with basic POSIX matching. I.e. 'git grep -P '[\d]' would match "d" instead of digits. The entire test suite would still pass with this serious regression, since everything that tested for --perl-regexp would be guarded by the PCRE prerequisite, fix that blind-spot by adding tests under !PCRE asserting that git must die when given --perl-regexp or -P. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
9e3cbc59d5
commit
9001c1920c
@ -418,7 +418,9 @@ test_expect_success 'log with various grep.patternType configurations & command-
|
|||||||
git log --pretty=tformat:%s --perl-regexp \
|
git log --pretty=tformat:%s --perl-regexp \
|
||||||
--grep="[\d]\|" >actual.perl.long-arg &&
|
--grep="[\d]\|" >actual.perl.long-arg &&
|
||||||
test_cmp expect.perl actual.perl.long-arg
|
test_cmp expect.perl actual.perl.long-arg
|
||||||
|
else
|
||||||
|
test_must_fail git log --perl-regexp \
|
||||||
|
--grep="[\d]\|"
|
||||||
fi &&
|
fi &&
|
||||||
test_cmp expect.fixed actual.fixed.long-arg &&
|
test_cmp expect.fixed actual.fixed.long-arg &&
|
||||||
test_cmp expect.basic actual.basic.long-arg &&
|
test_cmp expect.basic actual.basic.long-arg &&
|
||||||
|
@ -281,6 +281,10 @@ do
|
|||||||
test_cmp expected actual
|
test_cmp expected actual
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success !PCRE "grep $L with grep.patterntype=perl errors without PCRE" '
|
||||||
|
test_must_fail git -c grep.patterntype=perl grep "foo.*bar"
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success "grep $L with grep.patternType=default and grep.extendedRegexp=true" '
|
test_expect_success "grep $L with grep.patternType=default and grep.extendedRegexp=true" '
|
||||||
echo "${HC}ab:abc" >expected &&
|
echo "${HC}ab:abc" >expected &&
|
||||||
git \
|
git \
|
||||||
@ -1058,11 +1062,19 @@ test_expect_success PCRE 'grep --perl-regexp pattern' '
|
|||||||
test_cmp expected actual
|
test_cmp expected actual
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success !PCRE 'grep --perl-regexp pattern errors without PCRE' '
|
||||||
|
test_must_fail git grep --perl-regexp "foo.*bar"
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success PCRE 'grep -P pattern' '
|
test_expect_success PCRE 'grep -P pattern' '
|
||||||
git grep -P "\p{Ps}.*?\p{Pe}" hello.c >actual &&
|
git grep -P "\p{Ps}.*?\p{Pe}" hello.c >actual &&
|
||||||
test_cmp expected actual
|
test_cmp expected actual
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success !PCRE 'grep -P pattern errors without PCRE' '
|
||||||
|
test_must_fail git grep -P "foo.*bar"
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success 'grep pattern with grep.extendedRegexp=true' '
|
test_expect_success 'grep pattern with grep.extendedRegexp=true' '
|
||||||
>empty &&
|
>empty &&
|
||||||
test_must_fail git -c grep.extendedregexp=true \
|
test_must_fail git -c grep.extendedregexp=true \
|
||||||
|
Loading…
Reference in New Issue
Block a user