commit b9acf54dbd2906249abb2a406d466b47da44678e
author Brandon Williams <bmwill@google.com> Tue May 30 10:30:55 2017 -0700
committer Junio C Hamano <gitster@pobox.com> Fri Jun 02 09:36:07 2017 +0900
tree 72bdfd4a15a8437bd7ce55e1a379369449f6f9db
parent bd25f288767aa26f42ac02d2d36695c8df9134dd

combine-diff: convert diff_tree_combined to struct object_id

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/diff.c

diff --git a/builtin/diff.c b/builtin/diff.c
index b2d7c32..73b4ff3 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -194,7 +194,7 @@ static int builtin_diff_combined(struct rev_info *revs,
 		revs->dense_combined_merges = revs->combine_merges = 1;
 	for (i = 1; i < ents; i++)
 		oid_array_append(&parents, &ent[i].item->oid);
-	diff_tree_combined(ent[0].item->oid.hash, &parents,
+	diff_tree_combined(&ent[0].item->oid, &parents,
 			   revs->dense_combined_merges, revs);
 	oid_array_clear(&parents);
 	return 0;