aboutsummaryrefslogtreecommitdiff
path: root/builtin-grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-03 00:32:29 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-03 00:32:29 -0800
commit281907574ca420cc9a800190509adbf89bf9a2d1 (patch)
treedc338b120a9447be2e97be7b1505ea3e8f9d4f9c /builtin-grep.c
parent6ac92294b30d7c8619cf15b531448f011dbdcdcc (diff)
parentbc395643b606ffe7a5c01e2772ae0644c840f368 (diff)
downloadgit-281907574ca420cc9a800190509adbf89bf9a2d1.tar.gz
git-281907574ca420cc9a800190509adbf89bf9a2d1.tar.xz
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: grep: pass -I (ignore binary) down to external grep
Diffstat (limited to 'builtin-grep.c')
-rw-r--r--builtin-grep.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-grep.c b/builtin-grep.c
index bebf15cd6..3f12ba382 100644
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -291,6 +291,8 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached)
push_arg("-E");
if (opt->regflags & REG_ICASE)
push_arg("-i");
+ if (opt->binary == GREP_BINARY_NOMATCH)
+ push_arg("-I");
if (opt->word_regexp)
push_arg("-w");
if (opt->name_only)