diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-10 18:55:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-10 18:55:29 (GMT) |
| commit | 7b163e918772736b69252053913ba5ccc24adb4d (patch) | |
| tree | 0352673d01121d6578ffd25b2a15f7b438b2d707 /t | |
| parent | cee6c5b47bfa5d20fdf504fd61d200c0ee5eb777 (diff) | |
| parent | 8465541e8ce8eaf16e66ab847086779768c18f2d (diff) | |
| download | git-7b163e918772736b69252053913ba5ccc24adb4d.zip git-7b163e918772736b69252053913ba5ccc24adb4d.tar.gz git-7b163e918772736b69252053913ba5ccc24adb4d.tar.bz2 | |
Merge branch 'jc/grep-commandline-vs-configuration' into maint
"git -c grep.patternType=extended log --basic-regexp" misbehaved
because the internal API to access the grep machinery was not
designed well.
* jc/grep-commandline-vs-configuration:
grep: further simplify setting the pattern type
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4202-log.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 128ba93..0b53e56 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -255,6 +255,20 @@ test_expect_success 'log -F -E --grep=<ere> uses ere' ' test_cmp expect actual ' +test_expect_success 'log with grep.patternType configuration' ' + >expect && + git -c grep.patterntype=fixed \ + log -1 --pretty=tformat:%s --grep=s.c.nd >actual && + test_cmp expect actual +' + +test_expect_success 'log with grep.patternType configuration and command line' ' + echo second >expect && + git -c grep.patterntype=fixed \ + log -1 --pretty=tformat:%s --basic-regexp --grep=s.c.nd >actual && + test_cmp expect actual +' + cat > expect <<EOF * Second * sixth |