From 89d07f750a3f878c42b3de96ee93dc571b42b230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Sun, 12 Aug 2007 19:46:55 +0200 Subject: diff: don't run pager if user asked for a diff style exit code As Wincent Colaiuta found out, it's a bit unexpected for git diff to start a pager even when the --quiet option is specified. The problem is that the pager hides the return code -- which is the only output we're interested in in this case. Push pager setup down into builtin-diff.c and don't start the pager if --exit-code or --quiet (which implies --exit-code) was specified. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- builtin-diff.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'builtin-diff.c') diff --git a/builtin-diff.c b/builtin-diff.c index b48121e6e2..8dc17b0dd7 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -235,6 +235,12 @@ int cmd_diff(int argc, const char **argv, const char *prefix) rev.diffopt.allow_external = 1; rev.diffopt.recursive = 1; + /* If the user asked for our exit code then don't start a + * pager or we would end up reporting its exit code instead. + */ + if (!rev.diffopt.exit_with_status) + setup_pager(); + /* Do we have --cached and not have a pending object, then * default to HEAD by hand. Eek. */ -- cgit v1.2.3