Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-15 09:46:16 +01:00
Code Issues Packages Projects Releases Activity

Use new IntegrateChangesFromWorkdirException in merge command

Browse Source
This commit is contained in:
René Pfeuffer
2019-03-29 16:13:29 +01:00
parent 2e93a9efec
commit f8a59a4d0f
1 changed files with 2 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

@@ -185,7 +185,8 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
try { try {
clone.push().call(); clone.push().call();
} catch (GitAPIException e) { } catch (GitAPIException e) {
throw new InternalRepositoryException(context.getRepository(), "could not push merged branch " + target + " to origin", e); throw new IntegrateChangesFromWorkdirException(repository,
"could not push merged branch " + target + " into central repository", e);
} }
logger.debug("pushed merged branch {}", target); logger.debug("pushed merged branch {}", target);
} }