summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-05-30 17:30:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-02 00:36:07 (GMT)
commitb9acf54dbd2906249abb2a406d466b47da44678e (patch)
tree72bdfd4a15a8437bd7ce55e1a379369449f6f9db /builtin/diff.c
parentbd25f288767aa26f42ac02d2d36695c8df9134dd (diff)
downloadgit-b9acf54dbd2906249abb2a406d466b47da44678e.zip
git-b9acf54dbd2906249abb2a406d466b47da44678e.tar.gz
git-b9acf54dbd2906249abb2a406d466b47da44678e.tar.bz2
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>
Diffstat (limited to 'builtin/diff.c')
-rw-r--r--builtin/diff.c2
1 files changed, 1 insertions, 1 deletions
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;