diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2013-01-29 08:05:00 +0100 |
|---|---|---|
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | 2013-01-29 08:05:00 +0100 |
| commit | eb6093293022e468c2aea93a11f63b366e0d3891 (patch) | |
| tree | abc08cfd4528f7a2a770345e55e43706d42687d1 /org.eclipse.jgit/src/org/eclipse/jgit/api | |
| parent | 83032e9f66552a43504456233ad9900bc2712077 (diff) | |
| download | jgit-eb6093293022e468c2aea93a11f63b366e0d3891.tar.gz jgit-eb6093293022e468c2aea93a11f63b366e0d3891.zip | |
Fix Check for FF_ONLY merges again
Added more FF-mode tests
Change-Id: I33eed5737d9411cc1cf214da62ce719916a1b736
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/api')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java | 2 |
1 files changed, 1 insertions, 1 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 aacc970e5e..6eba35e1d2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java @@ -300,7 +300,7 @@ public class MergeCommand extends GitCommand<MergeResult> { headCommit, srcCommit }, mergeStatus, mergeStrategy, null, msg); } else { - if (fastForwardMode == FastForwardMode.NO_FF) { + if (fastForwardMode == FastForwardMode.FF_ONLY) { return new MergeResult(headCommit, srcCommit, new ObjectId[] { headCommit, srcCommit }, MergeStatus.ABORTED, mergeStrategy, null, null); |