diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2013-01-28 19:02:18 -0500 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2013-01-28 19:02:18 -0500 |
| commit | 83032e9f66552a43504456233ad9900bc2712077 (patch) | |
| tree | 68a81f503a08f92ca163cb8bc975ede50c0bf454 /org.eclipse.jgit | |
| parent | ee413067fded57d817af5b6b9978b8ceb6e6374e (diff) | |
| parent | 642ff2cd7dd6ae361e4993255ade89a32e20601f (diff) | |
| download | jgit-83032e9f66552a43504456233ad9900bc2712077.tar.gz jgit-83032e9f66552a43504456233ad9900bc2712077.zip | |
Merge "Check for FF_ONLY merges correctly"
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java index 2d3a6e1877..aacc970e5e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java @@ -269,7 +269,7 @@ public class MergeCommand extends GitCommand<MergeResult> { headCommit, srcCommit }, MergeStatus.ALREADY_UP_TO_DATE, mergeStrategy, null, null); } else if (revWalk.isMergedInto(headCommit, srcCommit) - && fastForwardMode == FastForwardMode.FF) { + && fastForwardMode != FastForwardMode.NO_FF) { // FAST_FORWARD detected: skip doing a real merge but only // update HEAD refLogMessage.append(": " + MergeStatus.FAST_FORWARD); //$NON-NLS-1$ @@ -300,7 +300,7 @@ public class MergeCommand extends GitCommand<MergeResult> { headCommit, srcCommit }, mergeStatus, mergeStrategy, null, msg); } else { - if (fastForwardMode == FastForwardMode.FF_ONLY) { + if (fastForwardMode == FastForwardMode.NO_FF) { return new MergeResult(headCommit, srcCommit, new ObjectId[] { headCommit, srcCommit }, MergeStatus.ABORTED, mergeStrategy, null, null); |