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

gitster · gitster · commit b70cec0a2e86 · 2015-03-28T09:33:11.000-07:00
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
@@ -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))

Original file line number	Diff line number	Diff line change
`@@ -885,7 +885,7 @@ int cmd_grep(int argc, const char *argv, const char prefix)`
`885`	`885`	`}`
`886`	`886`	`}`
`887`	`887`
`888`		`- if (!show_in_pager)`
	`888`	`+ if (!show_in_pager && !opt.status_only)`
`889`	`889`	`setup_pager();`
`890`	`890`
`891`	`891`	`if (!use_index && (untracked \|\| cached))`