summaryrefslogtreecommitdiff
path: root/builtin/grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-25 19:54:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-25 19:54:20 (GMT)
commit01c057df3fdf4b3fc50a49e61d0d9bd93517ff9b (patch)
tree17319f953d18bfb3cef3cdc1f6581d35a11da34b /builtin/grep.c
parent09e32fa0f886c5ce5ded5e213f690ed32017f369 (diff)
parentc2048f0b394fc5d5644956481b39f3d099cbe51c (diff)
downloadgit-01c057df3fdf4b3fc50a49e61d0d9bd93517ff9b.zip
git-01c057df3fdf4b3fc50a49e61d0d9bd93517ff9b.tar.gz
git-01c057df3fdf4b3fc50a49e61d0d9bd93517ff9b.tar.bz2
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
Diffstat (limited to 'builtin/grep.c')
-rw-r--r--builtin/grep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c
index 335f25d..abc4400 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))