projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2a5e339 d12a8cf)
Merge branch 'jh/unpack-trees-micro-optim' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 20 Apr 2017 05:10:05 +0000 (22:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Apr 2017 05:10:05 +0000 (22:10 -0700)
commit970c47a2f9c491a1d191ff9d6de45c537f0dc8c1
tree927ed6a9c35801777e478085a6d2fe43f0db2e3ctree | snapshot
parent2a5e339df97bdeac211947aac85b06b4aa06d62bcommit | diff
parentd12a8cf0af18804c2000efc7a0224da631e04cd1commit | diff
Merge branch 'jh/unpack-trees-micro-optim' into next

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
unpack-trees.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.