From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Mar 2008 05:13:44 +0000 (-0700)
Subject: Merge branch 'lt/unpack-trees'
X-Git-Tag: v1.5.5-rc0~25
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b85997d14d1873a4baa3d04966cd5947e6134acd;p=git.git

Merge branch 'lt/unpack-trees'

* lt/unpack-trees:
  unpack_trees(): fix diff-index regression.
  traverse_trees_recursive(): propagate merge errors up
  unpack_trees(): minor memory leak fix in unused destination index
  Make 'unpack_trees()' have a separate source and destination index
  Make 'unpack_trees()' take the index to work on as an argument
  Add 'const' where appropriate to index handling functions
  Fix tree-walking compare_entry() in the presense of --prefix
  Move 'unpack_trees()' over to 'traverse_trees()' interface
  Make 'traverse_trees()' traverse conflicting DF entries in parallel
  Add return value to 'traverse_tree()' callback
  Make 'traverse_tree()' use linked structure rather than 'const char *base'
  Add 'df_name_compare()' helper function
---

b85997d14d1873a4baa3d04966cd5947e6134acd