summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-28 09:33:11 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-28 09:33:11 -0700
commitb70cec0a2e8636c12617b38255c7ad2bb90f5cc9 (patch)
tree7ae183bef2edc0e86c8f89609591799d0471f739
parentMerge branch 'jc/submitting-patches-mention-send-email' into maint (diff)
parentgrep: fix "--quiet" overwriting current output (diff)
downloadtgif-b70cec0a2e8636c12617b38255c7ad2bb90f5cc9.tar.xz
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
-rw-r--r--builtin/grep.c2
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))