diff options
| author |  Wincent Colaiuta <win@wincent.com> | 2007-12-13 21:24:52 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-12-13 23:05:42 -0800 |
| commit | 62c64895cfcf3bbf34969a69fa96a631f7d5b14e (patch) | |
| tree | ba4176915a9320356f245f401913d2bfa9992b43 /builtin-diff-files.c | |
| parent | xdi_diff: trim common trailing lines (diff) | |
| download | tgif-62c64895cfcf3bbf34969a69fa96a631f7d5b14e.tar.xz | |
"diff --check" should affect exit status
"git diff" has a --check option that can be used to check for whitespace
problems but it only reported by printing warnings to the
console.
Now when the --check option is used we give a non-zero exit status,
making "git diff --check" nicer to use in scripts and hooks.
Signed-off-by: Wincent Colaiuta <win@wincent.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-diff-files.c')
| -rw-r--r-- | builtin-diff-files.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-diff-files.c b/builtin-diff-files.c index 046b7e34b5..4afc8724e7 100644 --- a/builtin-diff-files.c +++ b/builtin-diff-files.c @@ -33,5 +33,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix) result = run_diff_files_cmd(&rev, argc, argv); if (DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS)) return DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0; + if (rev.diffopt.output_format & DIFF_FORMAT_CHECKDIFF) + return DIFF_OPT_TST(&rev.diffopt, CHECK_FAILED) != 0; return result; } |