From: Junio C Hamano <junkio@cox.net>
Date: Mon, 29 May 2006 06:05:02 +0000 (-0700)
Subject: Merge branch 'jc/lt-tree-n-cache-tree' into next
X-Git-Tag: v1.4.1-rc1~54
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=52bc0e294c0d5924db0e5e8f25284e467c6d2983;p=git.git

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)"
---

52bc0e294c0d5924db0e5e8f25284e467c6d2983
diff --cc builtin-read-tree.c
index 629d15163,b93178a4b..6a2ceba9c
--- a/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;
  	}