Merge branch 'rs/unpack-trees-leakfix'
commit27ed4350b76deaaacc8b77d1272deec3433cbd38
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 19:39:58 +0000 (16 12:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 19:39:58 +0000 (16 12:39 -0700)
tree820d59ecc5e89665edef43370a32e29a7958c620
parent0e9b0ac712d09d77a10586f5ff669bf6af3dd538
parent6ff264ee05cc8fd6b2c796623eadb8662444a458
Merge branch 'rs/unpack-trees-leakfix'

By RenĂ© Scharfe
* rs/unpack-trees-leakfix:
  unpack-trees: plug minor memory leak
  unpack-trees: don't perform any index operation if we're not merging