diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:44:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:44:06 -0800 |
| commit | 6b45b8c088f21566cd9cb7839f8421bf616382a2 (patch) | |
| tree | cfafac45e083d85e011aef8e6a77b12b6d1b103e /builtin-rev-list.c | |
| parent | 82cd8358e8203fa02da18e8ee71449cb45c4157d (diff) | |
| parent | 80235ba79ef43349f455cce869397b3e726f4058 (diff) | |
| download | git-6b45b8c088f21566cd9cb7839f8421bf616382a2.tar.gz | |
Merge branch 'jc/grep-author-all-match-implicit'
* jc/grep-author-all-match-implicit:
"log --author=me --grep=it" should find intersection, not union
Diffstat (limited to 'builtin-rev-list.c')
| -rw-r--r-- | builtin-rev-list.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin-rev-list.c b/builtin-rev-list.c index c924b3a2c7..5679170e82 100644 --- a/builtin-rev-list.c +++ b/builtin-rev-list.c @@ -371,8 +371,9 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) revs.diff) usage(rev_list_usage); - save_commit_buffer = revs.verbose_header || - revs.grep_filter.pattern_list; + save_commit_buffer = (revs.verbose_header || + revs.grep_filter.pattern_list || + revs.grep_filter.header_list); if (bisect_list) revs.limited = 1; |