"diff --check" should affect exit status

[git.git] / builtin-diff-files.c

diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index 046b7e34b5d5c6306d335dddbd5e283c8166e80e..4afc8724e71449667ce22ac8efd0910b7a57ef42 100644 (file)
--- 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;
 }