Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-12-21 15:59:48 +01:00
Code Issues Packages Projects Releases Activity

Use dedicated exception for unsupported merge strategies

Browse Source
This commit is contained in:
Rene Pfeuffer
2019-11-08 15:44:37 +01:00
parent 52ccce1aaa
commit ae32b6f797
4 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ import sonia.scm.repository.InternalRepositoryException;
import sonia.scm.repository.api.MergeCommandResult;
import sonia.scm.repository.api.MergeDryRunCommandResult;
import sonia.scm.repository.api.MergeStrategy;
import sonia.scm.repository.api.MergeStrategyNotSupportedException;
import java.io.IOException;
import java.util.Set;
@@ -46,7 +47,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
return inClone(clone -> new GitMergeCommit(clone, request, context, repository), workdirFactory, request.getTargetBranch());
default:
throw new IllegalArgumentException("unknown merge strategy: " + request.getMergeStrategy());
throw new MergeStrategyNotSupportedException(repository, request.getMergeStrategy());
}
}