summaryrefslogtreecommitdiff
path: root/t/t4202-log.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-11-18 19:32:11 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-11-18 19:32:12 -0800
commit4607a8ce68f4e407bcaaf04819713b40dffce385 (patch)
tree5cfdeb3eff6244e2db131d281204ed036e3e3ec2 /t/t4202-log.sh
parentMerge branch 'da/mergetools-p4' into maint (diff)
parentlog --grep: use the same helper to set -E/-F options as "git grep" (diff)
downloadtgif-4607a8ce68f4e407bcaaf04819713b40dffce385.tar.xz
Merge branch 'jc/grep-pcre-loose-ends' (early part) into maint
"git log -F -E --grep='<ere>'" failed to use the given <ere> pattern as extended regular expression, and instead looked for the string literally. * 'jc/grep-pcre-loose-ends' (early part): log --grep: use the same helper to set -E/-F options as "git grep" revisions: initialize revs->grep_filter using grep_init() grep: move pattern-type bits support to top-level grep.[ch] grep: move the configuration parsing logic to grep.[ch] builtin/grep.c: make configuration callback more reusable
Diffstat (limited to 't/t4202-log.sh')
-rwxr-xr-xt/t4202-log.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 924ba536ca..e6537abe1d 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -230,6 +230,12 @@ test_expect_success 'log --grep -i' '
test_cmp expect actual
'
+test_expect_success 'log -F -E --grep=<ere> uses ere' '
+ echo second >expect &&
+ git log -1 --pretty="tformat:%s" -F -E --grep=s.c.nd >actual &&
+ test_cmp expect actual
+'
+
cat > expect <<EOF
* Second
* sixth