Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-17 18:51:10 +01:00
Code Issues Packages Projects Releases Activity

Do not merge with fast forward

Browse Source
This commit is contained in:
René Pfeuffer
2018-12-10 12:01:13 +01:00
parent 0e333002db
commit a54faf1233
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
View File

@@ -4,6 +4,7 @@ import com.google.common.base.Strings;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.Subject;
import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.MergeCommand.FastForwardMode;
import org.eclipse.jgit.api.MergeResult; import org.eclipse.jgit.api.MergeResult;
import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.RefNotFoundException; import org.eclipse.jgit.api.errors.RefNotFoundException;
@@ -129,6 +130,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
throw notFound(entity("revision", toMerge).in(context.getRepository())); throw notFound(entity("revision", toMerge).in(context.getRepository()));
} }
result = clone.merge() result = clone.merge()
.setFastForward(FastForwardMode.NO_FF)
.setCommit(false) // we want to set the author manually .setCommit(false) // we want to set the author manually
.include(toMerge, sourceRevision) .include(toMerge, sourceRevision)
.call(); .call();