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

diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index 6ba5077a2..046b7e34b 100644
--- a/builtin-diff-files.c
+++ b/builtin-diff-files.c
@@ -10,7 +10,7 @@
 #include "builtin.h"
 
 static const char diff_files_usage[] =
-"git-diff-files [-q] [-0/-1/2/3 |-c|--cc|-n|--no-index] [<common diff options>] [<path>...]"
+"git-diff-files [-q] [-0/-1/2/3 |-c|--cc|--no-index] [<common diff options>] [<path>...]"
 COMMON_DIFF_OPTIONS_HELP;
 
 int cmd_diff_files(int argc, const char **argv, const char *prefix)
@@ -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;
 }