From 82889295e76200714d76e0f7beb07b6b9e3b5a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Sat, 17 Dec 2011 11:20:07 +0100 Subject: pass struct commit to diff_tree_combined_merge() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of passing the hash of a commit and then searching that same commit in the single caller, simply pass the commit directly. Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano --- combine-diff.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'combine-diff.c') diff --git a/combine-diff.c b/combine-diff.c index cfe62303a8..a2e8dcf855 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); } -- cgit v1.2.1