diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMerger.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMerger.java index 6fe942ed7e..5bca7440d2 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMerger.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMerger.java @@ -1,9 +1,6 @@ package sonia.scm.repository.spi; -import org.eclipse.jgit.api.MergeResult; import org.eclipse.jgit.revwalk.RevCommit; -import sonia.scm.ContextEntry; -import sonia.scm.repository.InternalRepositoryException; import java.util.Optional; @@ -13,6 +10,6 @@ public class GitMerger { if (revCommit.isPresent()) { return revCommit.get().toString().split(" ")[1]; } - throw new InternalRepositoryException(ContextEntry.ContextBuilder.entity(GitMerger.class, "merge commit failed"), "could not create commit on merge"); + return ""; } }