From 3ea788c3e3e045f61a2ea9b8320d2ba66457fd16 Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Wed, 18 Dec 2019 14:33:50 +0100
Subject: [PATCH] fix unit test

---
 .../src/main/java/sonia/scm/repository/spi/GitMerger.java    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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 "";
   }
 }