From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 May 2012 18:15:10 +0000 (-0700)
Subject: Merge branch 'rs/unpack-trees-leakfix' into maint
X-Git-Tag: v1.7.10.2~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=485cfd1a9214af705294ec0fd345450cca0ab16d;p=git.git

Merge branch 'rs/unpack-trees-leakfix' into maint

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
---

485cfd1a9214af705294ec0fd345450cca0ab16d