X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fdiff.c;h=0fe638fc45c780e53901b8be22d3b4d715be3c30;hb=50c94032844bb184cdeff7779be3b6a23e04d312;hp=14bd14fce0fa6b9c9b047142d23d4a2237b57a36;hpb=69d61daec7a7915f6a664f32002fd9403e7f2a34;p=git.git

diff --git a/builtin/diff.c b/builtin/diff.c
index 14bd14fce..0fe638fc4 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -182,6 +182,7 @@ static int builtin_diff_combined(struct rev_info *revs,
 		hashcpy((unsigned char *)(parent + i), ent[i].item->sha1);
 	diff_tree_combined(parent[0], parent + 1, ents - 1,
 			   revs->dense_combined_merges, revs);
+	free((void *)parent);
 	return 0;
 }
 
@@ -276,9 +277,6 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 	gitmodules_config();
 	git_config(git_diff_ui_config, NULL);
 
-	if (diff_use_color_default == -1)
-		diff_use_color_default = git_use_color_default;
-
 	init_revisions(&rev, prefix);
 
 	/* If this is a no-index diff, just run it and exit there. */