[PATCH] Don't use the pager when running "git diff --check"
- From
Wincent Colaiuta <win@wincent.com>
- Date
- Dec 13, 2007, 19:45 UTC
- Message-ID
- <1197575138-58070-1-git-send-email-win@wincent.com>
- In-Reply-To
- <1197552751-53480-2-git-send-email-win@wincent.com>
In 89d07f75 "git diff" learnt to not run the pager if the user passes the --exit-code switch. This commit does the same for the --check switch for the same reason: we want the user to get the exit status from "git diff", not the pager.
Signed-off-by: Wincent Colaiuta <win@wincent.com> ---
This really should have been part of my original patch, ([PATCH 1/5] "diff --check" should affect exit status"), but I only just discovered this now.
builtin-diff.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/builtin-diff.c b/builtin-diff.c index 86d01a3..ed2d218 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -247,7 +247,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix) /* 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 (!DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS)) + if (!DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS) && + (!&rev.diffopt.output_format & DIFF_FORMAT_CHECKDIFF)) setup_pager(); /* Do we have --cached and not have a pending object, then
-- 1.5.4.rc0.5.gd201-dirty