Merge branch 'rs/unpack-trees-leakfix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 May 2012 18:15:10 +0000 (11:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 May 2012 18:15:10 +0000 (11:15 -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