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

diff --git a/builtin/grep.c b/builtin/grep.c
index 335f25d0ad69a41ee2ea1e1e38aecbc2c121cb8c..abc440023ff98e354a92f002419b52836e4155c0 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))