Merge branch 'maint-1.6.0' into maint

* maint-1.6.0: grep: pass -I (ignore binary) down to external grep
git-mirror · Feb 3, 2009 · 2819075 · 2819075
2 parents 6ac9229 + bc39564
commit 2819075
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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)