From: Junio C Hamano Date: Tue, 11 Jun 2013 20:30:05 +0000 (-0700) Subject: Merge branch 'rs/unpack-trees-plug-leak' X-Git-Tag: v1.8.4-rc0~195 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dd261b1727e4c251e761b45295c00d1cfcf52b8b Merge branch 'rs/unpack-trees-plug-leak' * 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 --- dd261b1727e4c251e761b45295c00d1cfcf52b8b