Make sha1_array_append take a struct object_id *

[thirdparty/git.git] / builtin / diff.c

diff --git a/builtin/diff.c b/builtin/diff.c
index 398eee00d5d7d1b802c7eb659c002b65cafee10e..a5b34eb15636cdfdee452db0fd855763f0779902 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -193,7 +193,7 @@ static int builtin_diff_combined(struct rev_info *revs,
        if (!revs->dense_combined_merges && !revs->combine_merges)
                revs->dense_combined_merges = revs->combine_merges = 1;
        for (i = 1; i < ents; i++)
-               sha1_array_append(&parents, ent[i].item->oid.hash);
+               sha1_array_append(&parents, &ent[i].item->oid);
        diff_tree_combined(ent[0].item->oid.hash, &parents,
                           revs->dense_combined_merges, revs);
        sha1_array_clear(&parents);