X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=combine-diff.c;h=a2e8dcf8553ff15d7cfed8f8ec4735185ec162bb;hb=a78f5582fca15950eb43f93b246e3778d0ae84da;hp=cfe62303a8634cb68c5f671c147efe97a5aca273;hpb=0041f09de6e62efc31c860487f04e8b08bce68c8;p=git.git

diff --git a/combine-diff.c b/combine-diff.c
index cfe62303a..a2e8dcf85 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1196,10 +1196,9 @@ void diff_tree_combined(const unsigned char *sha1,
 	}
 }
 
-void diff_tree_combined_merge(const unsigned char *sha1,
-			     int dense, struct rev_info *rev)
+void diff_tree_combined_merge(const struct commit *commit, int dense,
+			      struct rev_info *rev)
 {
-	struct commit *commit = lookup_commit(sha1);
 	struct commit_list *parent = commit->parents;
 	struct sha1_array parents = SHA1_ARRAY_INIT;
 
@@ -1207,6 +1206,6 @@ void diff_tree_combined_merge(const unsigned char *sha1,
 		sha1_array_append(&parents, parent->item->object.sha1);
 		parent = parent->next;
 	}
-	diff_tree_combined(sha1, &parents, dense, rev);
+	diff_tree_combined(commit->object.sha1, &parents, dense, rev);
 	sha1_array_clear(&parents);
 }