Merge branch 'jc/lt-tree-n-cache-tree' into next

* jc/lt-tree-n-cache-tree:
  Remove "tree->entries" tree-entry list from tree parser
  Switch "read_tree_recursive()" over to tree-walk functionality
  Make "tree_entry" have a SHA1 instead of a union of object pointers
  Add raw tree buffer info to "struct tree"
  Don't use "sscanf()" for tree mode scanning
  git-fetch: avoid using "case ... in (arm)"

diff --cc builtin-read-tree.c
index 629d15163951b30a7a346aa4aafbd7abef25fd06,b93178a4ba02d234e907d10d39e9d56051171dbc..6a2ceba9ce0d67cf8ccd4567f7a9779dba66e20b
--- 1/builtin-read-tree.c
--- 2/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@@ -369,11 -370,10 +371,11 @@@ 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))
 +              if (unpack_trees_rec(posns, len, prefix ? prefix : "",
 +                                   fn, &indpos))
                        return -1;
        }
  

diff --cc fetch.c
Simple merge