X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-diff-files.c;h=6cb30c8e12488f42521df71a844a86a2e9a968c7;hb=709b148a907e68bfb57808de8f65b186cc9a5e21;hp=e1199f80ae34a53872ca6a74ae9678053e33db14;hpb=253e772edeb56092e0fad43ec0640658671313c5;p=git.git

diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index e1199f80a..6cb30c8e1 100644
--- a/builtin-diff-files.c
+++ b/builtin-diff-files.c
@@ -10,21 +10,26 @@
 #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)
 {
 	struct rev_info rev;
 	int nongit = 0;
+	int result;
 
 	prefix = setup_git_directory_gently(&nongit);
 	init_revisions(&rev, prefix);
 	git_config(git_default_config); /* no "diff" UI options */
 	rev.abbrev = 0;
 
-	argc = setup_revisions(argc, argv, &rev, NULL);
+	if (!setup_diff_no_index(&rev, argc, argv, nongit, prefix))
+		argc = 0;
+	else
+		argc = setup_revisions(argc, argv, &rev, NULL);
 	if (!rev.diffopt.output_format)
 		rev.diffopt.output_format = DIFF_FORMAT_RAW;
-	return run_diff_files_cmd(&rev, argc, argv);
+	result = run_diff_files_cmd(&rev, argc, argv);
+	return rev.diffopt.exit_with_status ? rev.diffopt.has_changes: result;
 }