Merge branch 'ws/grep-quiet-no-pager'

Even though "git grep --quiet" is run merely to ask for the exit
status, we spawned the pager regardless.  Stop doing that.

* ws/grep-quiet-no-pager:
  grep: fix "--quiet" overwriting current output
This commit is contained in:
Junio C Hamano 2015-03-25 12:54:20 -07:00
commit 01c057df3f

View File

@ -885,7 +885,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
}
}
if (!show_in_pager)
if (!show_in_pager && !opt.status_only)
setup_pager();
if (!use_index && (untracked || cached))