Merge branch 'rs/unpack-trees-leakfix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 19:39:58 +0000 (12:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 19:39:58 +0000 (12:39 -0700)
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


Trivial merge