X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=builtin-diff-index.c;h=95a3db156bda2d1e8d2ad7bdf72a9f9a821c6f51;hb=204d409247e7bbc7848569462aa11a87e373c8d6;hp=1958580d82e54ab5a5b1e054263eab7264c4bcb2;hpb=51937e533a39078a6d440b8a0b89bb491061c80b;p=thirdparty%2Fgit.git

diff --git a/builtin-diff-index.c b/builtin-diff-index.c
index 1958580d82..95a3db156b 100644
--- a/builtin-diff-index.c
+++ b/builtin-diff-index.c
@@ -9,14 +9,14 @@ static const char diff_cache_usage[] =
 "[<common diff options>] <tree-ish> [<path>...]"
 COMMON_DIFF_OPTIONS_HELP;
 
-int cmd_diff_index(int argc, const char **argv, char **envp)
+int cmd_diff_index(int argc, const char **argv, const char *prefix)
 {
 	struct rev_info rev;
 	int cached = 0;
 	int i;
 
-	git_config(git_diff_config);
-	init_revisions(&rev);
+	init_revisions(&rev, prefix);
+	git_config(git_default_config); /* no "diff" UI options */
 	rev.abbrev = 0;
 
 	argc = setup_revisions(argc, argv, &rev, NULL);
@@ -28,11 +28,14 @@ int cmd_diff_index(int argc, const char **argv, char **envp)
 		else
 			usage(diff_cache_usage);
 	}
+	if (!rev.diffopt.output_format)
+		rev.diffopt.output_format = DIFF_FORMAT_RAW;
+
 	/*
 	 * Make sure there is one revision (i.e. pending object),
 	 * and there is no revision filtering parameters.
 	 */
-	if (!rev.pending_objects || rev.pending_objects->next ||
+	if (rev.pending.nr != 1 ||
 	    rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1)
 		usage(diff_cache_usage);
 	return run_diff_index(&rev, cached);