summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-04 21:39:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-04 21:39:18 (GMT)
commitb422d99658d1fde0a288c48225a9ae5789c7a270 (patch)
tree6aeb3e2b14f1bbcca050161902a72c30ec355c13 /t
parent1e9a4856fb263ad8227456f9ec6b78804afe7cee (diff)
parent8465541e8ce8eaf16e66ab847086779768c18f2d (diff)
downloadgit-b422d99658d1fde0a288c48225a9ae5789c7a270.zip
git-b422d99658d1fde0a288c48225a9ae5789c7a270.tar.gz
git-b422d99658d1fde0a288c48225a9ae5789c7a270.tar.bz2
Merge branch 'jc/grep-commandline-vs-configuration'
"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-xt/t4202-log.sh14
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 803e1e6..e2db47c 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