Browse Source

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
maint
Junio C Hamano 10 years ago
parent
commit
b70cec0a2e
  1. 2
      builtin/grep.c

2
builtin/grep.c

@ -885,7 +885,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) @@ -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))

Loading…
Cancel
Save