From: Junio C Hamano <junkio@cox.net>
Date: Tue, 30 May 2006 05:13:09 +0000 (-0700)
Subject: Merge branch 'jc/lt-tree-n-cache-tree' into lt/tree-2
X-Git-Tag: v1.4.0-rc1~10^2~2
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=47df096f254ccac5a81da615b3fd25f3cf466bbf

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

* jc/lt-tree-n-cache-tree:
  adjust to the rebased series by Linus.
  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"

This results as if an "ours" merge absorbed the previous "next"
branch change into the 10-patch series, but it really is a result
of an honest merge.

nothing to commit
---

47df096f254ccac5a81da615b3fd25f3cf466bbf