X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fdiff.c;h=0fe638fc45c780e53901b8be22d3b4d715be3c30;hb=e4776bd936aa162b7f00cb26260dc4a6ca444abb;hp=1118689fb246b864ce758039543327c4304cdaa4;hpb=7c4f050ae1e140a81f66b5cf92ad2c8673cfda8b;p=git.git

diff --git a/builtin/diff.c b/builtin/diff.c
index 1118689fb..0fe638fc4 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -182,7 +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(parent);
+	free((void *)parent);
 	return 0;
 }