X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-diff-stages.c;h=70bb89808d2296246edbafb8378aa651c3382261;hb=6900679c2f6d937a5a6ef616869c8887690ad19d;hp=30931fe0498753ed3a7f68be064027391a82e677;hpb=bc483d04804888c2da64e4c6685c2860a9041122;p=git.git

diff --git a/builtin-diff-stages.c b/builtin-diff-stages.c
index 30931fe04..70bb89808 100644
--- a/builtin-diff-stages.c
+++ b/builtin-diff-stages.c
@@ -46,7 +46,7 @@ static void diff_stages(int stage1, int stage2, const char **pathspec)
 		else if (!two)
 			diff_addremove(&diff_options, '-', ntohl(one->ce_mode),
 				       one->sha1, name, NULL);
-		else if (memcmp(one->sha1, two->sha1, 20) ||
+		else if (hashcmp(one->sha1, two->sha1) ||
 			 (one->ce_mode != two->ce_mode) ||
 			 diff_options.find_copies_harder)
 			diff_change(&diff_options,
@@ -55,13 +55,12 @@ static void diff_stages(int stage1, int stage2, const char **pathspec)
 	}
 }
 
-int cmd_diff_stages(int ac, const char **av, char **envp)
+int cmd_diff_stages(int ac, const char **av, const char *prefix)
 {
 	int stage1, stage2;
-	const char *prefix = setup_git_directory();
 	const char **pathspec = NULL;
 
-	git_config(git_diff_config);
+	git_config(git_default_config); /* no "diff" UI options */
 	read_cache();
 	diff_setup(&diff_options);
 	while (1 < ac && av[1][0] == '-') {