Merge branch 'jn/grep-open'

* jn/grep-open:
  grep -O: Do not pass color sequences as filenames to pager
This commit is contained in:
Junio C Hamano
2010-07-15 12:07:18 -07:00
2 changed files with 16 additions and 0 deletions

View File

@ -1001,6 +1001,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
if (show_in_pager == default_pager)
show_in_pager = git_pager(1);
if (show_in_pager) {
opt.color = 0;
opt.name_only = 1;
opt.null_following_name = 1;
opt.output_priv = &path_list;