Merge branch 'rs/unpack-trees-plug-leak' into next
commit97e7b6d0ee6a75c8bb1f75848cc3675f3dd1ce0b
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Jun 2013 20:17:23 +0000 (3 13:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Jun 2013 20:17:23 +0000 (3 13:17 -0700)
tree47b87dedcae2a8ffad6db84dc4883e1e1943a9e5
parent25af892a64d5b7accf1782d14a0ba0a65fb149bd
parent5d80ef5a6e727bbecd7d892a5043bae25f7ca5e2
Merge branch 'rs/unpack-trees-plug-leak' into next

* rs/unpack-trees-plug-leak:
  unpack-trees: free cache_entry array members for merges
  diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const
  diff-lib, read-tree, unpack-trees: mark cache_entry pointers const
  unpack-trees: create working copy of merge entry in merged_entry
  unpack-trees: factor out dup_entry
  read-cache: mark cache_entry pointers const
  cache: mark cache_entry pointers const
cache.h