From 33c670c1f0d195833e8c9cbefb90d469848b62e2 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Thu, 9 Dec 2010 10:54:01 -0800 Subject: [PATCH] Simplify logic in StrategySimpleTwoWayInCore Sasa and I were reviewing this code today and Sasa pointed out we can simplify the conflict logic, as the two cases (subtree and file) are logically identical. Change-Id: Ie0d40b2dd15605785eff453a846b1d20a2d021fc Signed-off-by: Shawn O. Pearce Reviewed-by: Sasa Zivkov --- .../eclipse/jgit/merge/StrategySimpleTwoWayInCore.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java index adb2278d8..d8a9423e8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java @@ -131,7 +131,7 @@ public class StrategySimpleTwoWayInCore extends ThreeWayMergeStrategy { add(T_THEIRS, DirCacheEntry.STAGE_0); else if (modeB == modeT && tw.idEqual(T_BASE, T_THEIRS)) add(T_OURS, DirCacheEntry.STAGE_0); - else if (tw.isSubtree()) { + else { if (nonTree(modeB)) { add(T_BASE, DirCacheEntry.STAGE_1); hasConflict = true; @@ -144,12 +144,8 @@ public class StrategySimpleTwoWayInCore extends ThreeWayMergeStrategy { add(T_THEIRS, DirCacheEntry.STAGE_3); hasConflict = true; } - tw.enterSubtree(); - } else { - add(T_BASE, DirCacheEntry.STAGE_1); - add(T_OURS, DirCacheEntry.STAGE_2); - add(T_THEIRS, DirCacheEntry.STAGE_3); - hasConflict = true; + if (tw.isSubtree()) + tw.enterSubtree(); } } builder.finish();