diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-08 11:35:59 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-08 11:35:59 +0300 |
| commit | 1f54d693fda851a1df81e2b6c85f1c72f4633916 (patch) | |
| tree | 64740b80a9b5509de9d5bbbb5290a4603a730673 /revision.c | |
| parent | 89cd4aa8624de4fa80469ab9ef8482f44b2cc2db (diff) | |
| parent | 80235ba79ef43349f455cce869397b3e726f4058 (diff) | |
Merge branch 'jc/grep-author-all-match-implicit' into maint
* jc/grep-author-all-match-implicit:
"log --author=me --grep=it" should find intersection, not union
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/revision.c b/revision.c index a8f0aa4c67..29721ecf84 100644 --- a/revision.c +++ b/revision.c @@ -826,6 +826,7 @@ void init_revisions(struct rev_info *revs, const char *prefix) revs->grep_filter.status_only = 1; revs->grep_filter.pattern_tail = &(revs->grep_filter.pattern_list); + revs->grep_filter.header_tail = &(revs->grep_filter.header_list); revs->grep_filter.regflags = REG_NEWLINE; diff_setup(&revs->diffopt); @@ -1804,7 +1805,7 @@ static int rewrite_parents(struct rev_info *revs, struct commit *commit) static int commit_match(struct commit *commit, struct rev_info *opt) { - if (!opt->grep_filter.pattern_list) + if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list) return 1; return grep_buffer(&opt->grep_filter, NULL, /* we say nothing, not even filename */ |