motiejus
/
jgit
1
Fork 0
Code Releases Activity

Revert "ResolveMerge only needs to visit differing TreeEntries" 

This reverts commit bda5e76420. This reduces
performance at least for non-bare repositories.

Change-Id: Ib26cf8372f210798e104112edf14e91bfeaf23ec
This commit is contained in:
Christian Halstrick 2015-04-10 07:52:19 +02:00 committed by Matthias Sohn
parent 300a55dcba
commit 510aed1493
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
View File

@ -90,7 +90,6 @@
import org.eclipse.jgit.treewalk.NameConflictTreeWalk;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.WorkingTreeIterator;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.TemporaryBuffer;
@ -1009,7 +1008,6 @@ protected boolean mergeTrees(AbstractTreeIterator baseTree,
DirCacheBuildIterator buildIt = new DirCacheBuildIterator(builder);
tw = new NameConflictTreeWalk(reader);
tw.setFilter(TreeFilter.ANY_DIFF);
tw.addTree(baseTree);
tw.addTree(headTree);
tw.addTree(mergeTree);