git-help: add -w|--web option to display html man page in a browser.

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

diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index 6cb30c8e12488f42521df71a844a86a2e9a968c7..046b7e34b5d5c6306d335dddbd5e283c8166e80e 100644 (file)
--- a/builtin-diff-files.c
+++ b/builtin-diff-files.c
@@ -31,5 +31,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
        if (!rev.diffopt.output_format)
                rev.diffopt.output_format = DIFF_FORMAT_RAW;
        result = run_diff_files_cmd(&rev, argc, argv);
-       return rev.diffopt.exit_with_status ? rev.diffopt.has_changes: result;
+       if (DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS))
+               return DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0;
+       return result;
 }