From f8a59a4d0f1066f781e365ec7a02ea62850eb978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 29 Mar 2019 16:13:29 +0100 Subject: [PATCH] Use new IntegrateChangesFromWorkdirException in merge command --- .../main/java/sonia/scm/repository/spi/GitMergeCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java index 94fe84446b..58c71b8dac 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java @@ -185,7 +185,8 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand try { clone.push().call(); } 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); }