]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3cd7d0d) | patch
ResolveMerge only needs to visit differing TreeEntries 62/44962/1
authorMatthias Sohn <matthias.sohn@sap.com>
Tue, 31 Mar 2015 15:33:31 +0000 (17:33 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 31 Mar 2015 15:33:31 +0000 (17:33 +0200)
commitbda5e764200dafb2311149a9152c02373127287d
tree0c76d0333e8a8c903c7e29c8a7415b9bad469ea3tree | snapshot
parent3cd7d0d85a5fe6ba03f218898e866f06258b7405commit | diff
ResolveMerge only needs to visit differing TreeEntries

This should considerably speed up the treewalk on larger repositories.

Found by discussing new EGit API to support model merge in change
eda23bb556d342f421f03b93c7faa160998598aa

Change-Id: I822721c76c64e614f87a080ced2457941f53adcd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
cc: Laurent Delaigue <laurent.delaigue@obeo.fr>
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit