Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
grep: pass -I (ignore binary) down to external grep

diff --git a/builtin-grep.c b/builtin-grep.c
index bebf15cd6f7d82b773f985ce238688b4759e3c37..3f12ba382690699d96580c3ddb1a61c79520e694 100644 (file)
--- 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)