From b9acf54dbd2906249abb2a406d466b47da44678e Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Tue, 30 May 2017 10:30:55 -0700 Subject: combine-diff: convert diff_tree_combined to struct object_id Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano --- builtin/diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin/diff.c') diff --git a/builtin/diff.c b/builtin/diff.c index b2d7c32cdb..73b4ff3db2 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; -- cgit v1.2.1