From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Apr 2017 05:07:48 +0000 (-0700)
Subject: Merge branch 'jh/unpack-trees-micro-optim'
X-Git-Tag: v2.13.0-rc1~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8868ba19626a72d5883241c36fd5477897ef8dd1;p=thirdparty%2Fgit.git

Merge branch 'jh/unpack-trees-micro-optim'

In a 2- and 3-way merge of trees, more than one source trees often
end up sharing an identical subtree; optimize by not reading the
same tree multiple times in such a case.

* jh/unpack-trees-micro-optim:
  unpack-trees: avoid duplicate ODB lookups during checkout
---

8868ba19626a72d5883241c36fd5477897ef8dd1