mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/grep-author-all-match-implicit' into maint

Browse Source 
* jc/grep-author-all-match-implicit:
  "log --author=me --grep=it" should find intersection, not union
This commit is contained in:
Junio C Hamano
2010-03-08 00:35:59 -08:00
parent 89cd4aa862 80235ba79e
commit 1f54d693fd
6 changed files with 56 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
revision.c
View File

@ -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 */