diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-28 19:33:11 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-28 19:33:11 +0300 |
| commit | b70cec0a2e8636c12617b38255c7ad2bb90f5cc9 (patch) | |
| tree | 7ae183bef2edc0e86c8f89609591799d0471f739 /builtin | |
| parent | a5d31548544a709b18926220867fe1c1995fa9c3 (diff) | |
| parent | c2048f0b394fc5d5644956481b39f3d099cbe51c (diff) | |
Merge branch 'ws/grep-quiet-no-pager' into maint
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/grep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index e77f7cf109..fe7b9fdd93 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -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)) |