Merge branch 'bw/server-options'

diff --git a/packfile.c b/packfile.c
index 6c3ddc3c31d008eb3817f21512815d89e37c4e1f..bfe2385f2a2b43984449f0cd49e92ce5541c998c 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -1944,7 +1944,7 @@ static int add_promisor_object(const struct object_id *oid,
                struct commit *commit = (struct commit *) obj;
                struct commit_list *parents = commit->parents;
 
-               oidset_insert(set, &commit->tree->object.oid);
+               oidset_insert(set, get_commit_tree_oid(commit));
                for (; parents; parents = parents->next)
                        oidset_insert(set, &parents->item->object.oid);
        } else if (obj->type == OBJ_TAG) {