Merge branch 'maint'

* maint:
  grep: pass -I (ignore binary) down to external grep
This commit is contained in:
Junio C Hamano 2009-02-03 00:32:34 -08:00
commit bd9efbf354

View File

@ -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)