X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=builtin-read-tree.c;h=da0731ca0e3e22dd8cbb9fbde9201c66de406b4a;hb=097dc3d8c32f4b85bf9701d5e1de98999ac25c1c;hp=f0b8dad6eb5c469b78f08c12aa0f62befbb54e80;hpb=2522c13244c13fe3a9f0769ea6294dce08e6596c;p=git.git

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index f0b8dad6..da0731ca 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -163,7 +163,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;
@@ -368,7 +368,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))