Merge branch 'jk/diff-result-code-cleanup'

[thirdparty/git.git] / diff.c

diff --git a/diff.c b/diff.c
index 28ba22947617d8ab23c2da7e65e6ed5c895484f4..bccb018da468480615c04d858909891ac59b69e5 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -6982,16 +6982,14 @@ void diffcore_std(struct diff_options *options)
        options->found_follow = 0;
 }
 
-int diff_result_code(struct diff_options *opt, int status)
+int diff_result_code(struct diff_options *opt)
 {
        int result = 0;
 
        diff_warn_rename_limit("diff.renameLimit",
                               opt->needed_rename_limit,
                               opt->degraded_cc_to_c);
-       if (!opt->flags.exit_with_status &&
-           !(opt->output_format & DIFF_FORMAT_CHECKDIFF))
-               return status;
+
        if (opt->flags.exit_with_status &&
            opt->flags.has_changes)
                result |= 01;