diff --git a/combine-diff.c b/combine-diff.c
index cfe62303a8634cb68c5f671c147efe97a5aca273..a2e8dcf8553ff15d7cfed8f8ec4735185ec162bb 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
}
}
-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;
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);
}