undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grep tests: add missing "grep.patternType" config tests

Browse Source 
Extend the grep tests to assert that setting
"grep.patternType=extended" followed by "grep.patternType=default"
will behave as if "--basic-regexp" was provided, and not as
"--extended-regexp". In a subsequent commit we'll need to treat
"grep.patternType=default" as a special-case, but let's make sure we
ignore it if it's being set to "default" following an earlier
non-"default" "grep.patternType" setting.

Let's also test what happens when we have a sequence of "extended"
followed by "default" and "fixed". In that case the "fixed" should
prevail, as well as tests to check that a "grep.extendedRegexp=true"
followed by a "grep.extendedRegexp=false" behaves as though
"grep.extendedRegexp" wasn't provided.

See [1] for the source of some of these tests, and their
initial (pseudocode) implementation, and [2] for a later discussion
about a breakage due to missing testing (which had been noted in [1]
all along).

1. https://lore.kernel.org/git/xmqqv8zf6j86.fsf@gitster.g/
2. https://lore.kernel.org/git/xmqqpmoczwtu.fsf@gitster.g/

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2022-02-16 01:00:33 +01:00 committed by Junio C Hamano
parent ccb1fccc21
commit a5c0ed3d83
1 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
t/t7810-grep.sh
View File

@ -461,6 +461,58 @@ do
-c grep.extendedRegexp=true \ -c grep.extendedRegexp=true \
-c grep.patternType=basic -c grep.patternType=basic
# grep.extendedRegexp is last-one-wins
test_pattern_type "$H" "$HC" "$L" BRE \
-c grep.extendedRegexp=true \
-c grep.extendedRegexp=false
# grep.patternType=basic pays no attention to grep.extendedRegexp
test_pattern_type "$H" "$HC" "$L" BRE \
-c grep.extendedRegexp=true \
-c grep.patternType=basic \
-c grep.extendedRegexp=false
# grep.patternType=extended pays no attention to grep.extendedRegexp
test_pattern_type "$H" "$HC" "$L" ERE \
-c grep.extendedRegexp=true \
-c grep.patternType=extended \
-c grep.extendedRegexp=false
# grep.extendedRegexp is used with a last-one-wins grep.patternType=default
test_pattern_type "$H" "$HC" "$L" ERE \
-c grep.patternType=fixed \
-c grep.extendedRegexp=true \
-c grep.patternType=default
# grep.extendedRegexp is used with earlier grep.patternType=default
test_pattern_type "$H" "$HC" "$L" ERE \
-c grep.extendedRegexp=false \
-c grep.patternType=default \
-c grep.extendedRegexp=true
# grep.extendedRegexp is used with a last-one-loses grep.patternType=default
test_pattern_type "$H" "$HC" "$L" ERE \
-c grep.extendedRegexp=false \
-c grep.extendedRegexp=true \
-c grep.patternType=default
# grep.extendedRegexp and grep.patternType are both last-one-wins independently
test_pattern_type "$H" "$HC" "$L" BRE \
-c grep.patternType=default \
-c grep.extendedRegexp=true \
-c grep.patternType=basic
# grep.patternType=extended and grep.patternType=default
test_pattern_type "$H" "$HC" "$L" BRE \
-c grep.patternType=extended \
-c grep.patternType=default
# grep.patternType=[extended -> default -> fixed] (BRE)" '
test_pattern_type "$H" "$HC" "$L" FIX \
-c grep.patternType=extended \
-c grep.patternType=default \
-c grep.patternType=fixed
test_expect_success "grep --count $L" ' test_expect_success "grep --count $L" '
echo ${HC}ab:3 >expected && echo ${HC}ab:3 >expected &&
git grep --count -e b $H -- ab >actual && git grep --count -e b $H -- ab >actual &&