git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8b6bba6 d12a8cf)
Merge branch 'jh/unpack-trees-micro-optim'
authorJunio C Hamano <redacted>
Mon, 24 Apr 2017 05:07:48 +0000 (22:07 -0700)
committerJunio C Hamano <redacted>
Mon, 24 Apr 2017 05:07:48 +0000 (22:07 -0700)
commit8868ba19626a72d5883241c36fd5477897ef8dd1
tree89157def2f48bd982313403bd658420be10624a6tree | snapshot
parent8b6bba66633cf16807ae962e0b1126af164f0e78commit | diff
parentd12a8cf0af18804c2000efc7a0224da631e04cd1commit | diff
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
unpack-trees.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT