summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-14 12:57:18 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-14 12:57:18 -0800
commit10439fc0effb194e1ce2cd4db8fbd69cfaf23656 (patch)
treecea18a64ff350d773df72e5776f415e37401c937 /revision.c
parent84f3d6458b0e71bd7a6c4f05ed3bd43b8fb9a9e4 (diff)
parent9dd5245c1043dd18fd7b3f44b9e51eef7e4b58d8 (diff)
downloadgit-10439fc0effb194e1ce2cd4db8fbd69cfaf23656.tar.gz
Merge branch 'jk/grep-binary-attribute'
* 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.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/revision.c b/revision.c
index c97d834484..819ff012ff 100644
--- a/revision.c
+++ b/revision.c
@@ -2149,7 +2149,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));
}