diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-18 14:37:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-18 14:37:54 -0700 |
| commit | 3d7535e42496a5b24d8cb17da1a332759928bd35 (patch) | |
| tree | 9139e1d1e3fb7d3cbe75c0aefe7cd07f6fd28034 /revision.c | |
| parent | 06e211acc61c52a2e1709ea8b62a0b0f6dcb492b (diff) | |
| parent | 39f2e017203695b9da2ad35589b0e58bcac6fdc8 (diff) | |
| download | git-3d7535e42496a5b24d8cb17da1a332759928bd35.tar.gz git-3d7535e42496a5b24d8cb17da1a332759928bd35.tar.xz | |
Merge branch 'jc/maint-log-grep-all-match'
Fix a long-standing bug in "git log --grep" when multiple "--grep"
are used together with "--all-match" and "--author" or "--committer".
* jc/maint-log-grep-all-match:
t7810-grep: test --all-match with multiple --grep and --author options
t7810-grep: test interaction of multiple --grep and --author options
t7810-grep: test multiple --author with --all-match
t7810-grep: test multiple --grep with and without --all-match
t7810-grep: bring log --grep tests in common form
grep.c: mark private file-scope symbols as static
log: document use of multiple commit limiting options
log --grep/--author: honor --all-match honored for multiple --grep patterns
grep: show --debug output only once
grep: teach --debug option to dump the parse tree
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/revision.c b/revision.c index dc3fecf90..ae12e11fb 100644 --- a/revision.c +++ b/revision.c @@ -1598,6 +1598,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg } else if ((argcount = parse_long_opt("grep", argv, &optarg))) { add_message_grep(revs, optarg); return argcount; + } else if (!strcmp(arg, "--grep-debug")) { + revs->grep_filter.debug = 1; } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) { revs->grep_filter.regflags |= REG_EXTENDED; } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) { |