tree-walk: init_tree_desc take an oid to get the hash algorithm

[thirdparty/git.git] / merge.c

diff --git a/merge.c b/merge.c
index b60925459c292bbb4a9daae46534edfbb3eca756..86179c34102de01b126aeb11fce50054aa2ac74f 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -81,7 +81,8 @@ int checkout_fast_forward(struct repository *r,
        }
        for (i = 0; i < nr_trees; i++) {
                parse_tree(trees[i]);
-               init_tree_desc(t+i, trees[i]->buffer, trees[i]->size);
+               init_tree_desc(t+i, &trees[i]->object.oid,
+                              trees[i]->buffer, trees[i]->size);
        }
 
        memset(&opts, 0, sizeof(opts));