Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-03 12:05:52 +01:00
Code Issues Packages Projects Releases Activity

add new MergeStrategies

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-11-06 07:47:23 +01:00
parent db46441adf
commit bc5948f823
4 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,11 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
private final GitWorkdirFactory workdirFactory;
private static final Set<MergeStrategy> STRATEGIES = ImmutableSet.of(MergeStrategy.SQUASH);
private static final Set<MergeStrategy> STRATEGIES = ImmutableSet.of(
MergeStrategy.SQUASH,
MergeStrategy.MERGE_COMMIT,
MergeStrategy.FAST_FORWARD_IF_POSSIBLE
);
GitMergeCommand(GitContext context, sonia.scm.repository.Repository repository, GitWorkdirFactory workdirFactory) {
super(context, repository);
@@ -64,6 +68,11 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
return STRATEGIES.contains(strategy);
}
@Override
public Set<MergeStrategy> getSupportedMergeStrategies() {
return STRATEGIES;
}
private class MergeWorker extends GitCloneWorker<MergeCommandResult> {
private final String target;