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

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