Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-06 21:45:43 +01:00
Code Issues Packages Projects Releases Activity

fix unit test

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-12-18 14:33:50 +01:00
parent 83cc1c4a6f
commit 3ea788c3e3
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMerger.java
View File

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