mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ws/grep-quiet-no-pager'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2015-03-25 12:54:20 -07:00
parent 09e32fa0f8 c2048f0b39
commit 01c057df3f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/grep.c
View File

@ -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(); setup_pager();
if (!use_index && (untracked || cached)) if (!use_index && (untracked || cached))