projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
f0b8dad
..
da0731c
100644
(file)
--- 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);
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;
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++) {
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))
posn = posn->next;
}
if (unpack_trees_rec(posns, len, "", fn, &indpos))