diff options
author | Jeff King <peff@peff.net> | 2012-10-29 04:12:15 -0400 |
---|---|---|
committer | Jeff King <peff@peff.net> | 2012-10-29 04:12:15 -0400 |
commit | d2f4469b13dcd5c850058fdee4b039f07bb33142 (patch) | |
tree | 8429b77b5076d354bac240ed165d4b27c7f79ff6 /t | |
parent | fdb4d27158e4f8e19ac3b11b896bff92038afbfa (diff) | |
parent | 0657bcbf6f0830bc4ce25d05060706f35f1d4eb7 (diff) | |
download | git-d2f4469b13dcd5c850058fdee4b039f07bb33142.tar.gz git-d2f4469b13dcd5c850058fdee4b039f07bb33142.tar.xz |
Merge branch 'jc/grep-pcre-loose-ends'
"git log -F -E --grep='<ere>'" failed to use the given <ere>
pattern as extended regular expression, and instead looked for the
string literally. The early part of this series is a fix for it;
the latter part teaches log to respect the grep.* configuration.
* jc/grep-pcre-loose-ends:
log: honor grep.* configuration
log --grep: accept --basic-regexp and --perl-regexp
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')
-rwxr-xr-x | t/t4202-log.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 924ba536c..e6537abe1 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 |