X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-diff-index.c;h=a1fa1b85cf741cd6b5f06afd02abbe618e86f5d1;hb=06d30f4f3eea71bce4cf48db3ea384976b3983b7;hp=1958580d82e54ab5a5b1e054263eab7264c4bcb2;hpb=d48f7168619932a389341f1f0c904ab6dc117b5e;p=git.git

diff --git a/builtin-diff-index.c b/builtin-diff-index.c
index 1958580d8..a1fa1b85c 100644
--- a/builtin-diff-index.c
+++ b/builtin-diff-index.c
@@ -15,7 +15,7 @@ int cmd_diff_index(int argc, const char **argv, char **envp)
 	int cached = 0;
 	int i;
 
-	git_config(git_diff_config);
+	git_config(git_default_config); /* no "diff" UI options */
 	init_revisions(&rev);
 	rev.abbrev = 0;
 
@@ -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);