X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-diff-files.c;h=046b7e34b5d5c6306d335dddbd5e283c8166e80e;hb=32d75d29f99cca8e0874b1bdf94ded48b576c906;hp=6cb30c8e12488f42521df71a844a86a2e9a968c7;hpb=7468c297fa88f0035dc719e996b93b1404eee6e3;p=git.git

diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index 6cb30c8e1..046b7e34b 100644
--- 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;
 }