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)
commit485cfd1a9214af705294ec0fd345450cca0ab16d
tree7c8542ad3c1957b96555b7fd23f8e9794af881ba
parent538847cd4c6a7398e8799a829d731be75f09152f
parent6ff264ee05cc8fd6b2c796623eadb8662444a458
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