diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-21 14:57:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-21 14:57:05 -0800 |
| commit | 6f61eb201799ee83c3a82f1f097c18b3854c0c03 (patch) | |
| tree | cf6db24e651eb191fd373d22a2929dd90be1af41 /revision.c | |
| parent | 093b194cc5570c825173a90538a4c212bc64bc7f (diff) | |
| parent | 9dd5245c1043dd18fd7b3f44b9e51eef7e4b58d8 (diff) | |
| download | git-6f61eb201799ee83c3a82f1f097c18b3854c0c03.tar.gz | |
Merge branch 'jk/grep-binary-attribute' into maint
* jk/grep-binary-attribute:
grep: pre-load userdiff drivers when threaded
grep: load file data after checking binary-ness
grep: respect diff attributes for binary-ness
grep: cache userdiff_driver in grep_source
grep: drop grep_buffer's "name" parameter
convert git-grep to use grep_source interface
grep: refactor the concept of "grep source" into an object
grep: move sha1-reading mutex into low-level code
grep: make locking flag global
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/revision.c b/revision.c index eb0be4206d..18be62b316 100644 --- a/revision.c +++ b/revision.c @@ -2136,7 +2136,6 @@ static int commit_match(struct commit *commit, struct rev_info *opt) 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 */ commit->buffer, strlen(commit->buffer)); } |