Remove "tree->entries" tree-entry list from tree parser

[git.git] / builtin-read-tree.c

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 67492bf..480e6ed 100644 (file)
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -165,7 +165,7 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len,
                                struct tree *tree = lookup_tree(posns[i]->sha1);
                                any_dirs = 1;
                                parse_tree(tree);
-                               subposns[i] = tree->entries;
+                               subposns[i] = create_tree_entry_list(tree);
                                posns[i] = posns[i]->next;
                                src[i + merge] = &df_conflict_entry;
                                continue;
@@ -370,7 +370,7 @@ static int unpack_trees(merge_fn_t fn)
        if (len) {
                posns = xmalloc(len * sizeof(struct tree_entry_list *));
                for (i = 0; i < len; i++) {
-                       posns[i] = ((struct tree *) posn->item)->entries;
+                       posns[i] = create_tree_entry_list((struct tree *) posn->item);
                        posn = posn->next;
                }
                if (unpack_trees_rec(posns, len, "", fn, &indpos))