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

Naming

Browse Source
This commit is contained in:
René Pfeuffer
2018-11-08 14:39:30 +01:00
parent 8d057f7745
commit 97d158ab35
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
View File

@@ -73,7 +73,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
} }
private MergeCommandResult merge() throws IOException { private MergeCommandResult merge() throws IOException {
createClone(); checkOutTargetBranch();
MergeResult result = doMergeInClone(); MergeResult result = doMergeInClone();
if (result.getMergeStatus().isSuccessful()) { if (result.getMergeStatus().isSuccessful()) {
doCommit(); doCommit();
@@ -84,7 +84,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
} }
} }
private void createClone() { private void checkOutTargetBranch() {
try { try {
clone.checkout().setName(target).call(); clone.checkout().setName(target).call();
} catch (GitAPIException e) { } catch (GitAPIException e) {

2
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/CloseableWrapperTest.java
View File

@@ -10,7 +10,7 @@ import static org.mockito.Mockito.verify;
public class CloseableWrapperTest { public class CloseableWrapperTest {
@Test @Test
public void x() { public void shouldExecuteGivenMethodAtClose() {
Consumer<String> wrapped = new Consumer<String>() { Consumer<String> wrapped = new Consumer<String>() {
// no this cannot be replaced with a lambda because otherwise we could not use Mockito#spy // no this cannot be replaced with a lambda because otherwise we could not use Mockito#spy
@Override @Override