From e736ae6c50a83a9cdbf9ac29025587016b88fafe Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Thu, 7 Nov 2019 13:42:45 +0100
Subject: [PATCH] cleanup

---
 .../scm/repository/spi/GitFastForwardIfPossible.java   |  2 ++
 .../sonia/scm/repository/spi/GitMergeStrategy.java     | 10 ----------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitFastForwardIfPossible.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitFastForwardIfPossible.java
index c7820009a1..417280046f 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitFastForwardIfPossible.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitFastForwardIfPossible.java
@@ -28,6 +28,8 @@ class GitFastForwardIfPossible extends GitMergeStrategy {
   private MergeCommandResult mergeWithCommit() throws IOException {
     MergeResult mergeCommitResult = mergeWithFastForwardMode(MergeCommand.FastForwardMode.NO_FF);
     if (mergeCommitResult.getMergeStatus().isSuccessful()) {
+      doCommit();
+      push();
       return MergeCommandResult.success();
     } else {
       return analyseFailure(mergeCommitResult);
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeStrategy.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeStrategy.java
index 43a3145405..d4d9de3de7 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeStrategy.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeStrategy.java
@@ -11,11 +11,9 @@ import org.slf4j.LoggerFactory;
 import sonia.scm.repository.InternalRepositoryException;
 import sonia.scm.repository.Person;
 import sonia.scm.repository.api.MergeCommandResult;
-import sonia.scm.repository.api.MergeStrategy;
 
 import java.io.IOException;
 import java.text.MessageFormat;
-import java.util.Collections;
 
 abstract class GitMergeStrategy extends AbstractGitCommand.GitCloneWorker<MergeCommandResult> {
 
@@ -30,7 +28,6 @@ abstract class GitMergeStrategy extends AbstractGitCommand.GitCloneWorker<MergeC
   private final String toMerge;
   private final Person author;
   private final String messageTemplate;
-  private final MergeStrategy mergeStrategy;
 
   GitMergeStrategy(Git clone, MergeCommandRequest request, GitContext context, sonia.scm.repository.Repository repository) {
     super(clone, context, repository);
@@ -38,7 +35,6 @@ abstract class GitMergeStrategy extends AbstractGitCommand.GitCloneWorker<MergeC
     this.toMerge = request.getBranchToMerge();
     this.author = request.getAuthor();
     this.messageTemplate = request.getMessageTemplate();
-    this.mergeStrategy = request.getMergeStrategy();
   }
 
   MergeResult doMergeInClone(MergeCommand mergeCommand) throws IOException {
@@ -73,10 +69,4 @@ abstract class GitMergeStrategy extends AbstractGitCommand.GitCloneWorker<MergeC
     logger.info("could not merged branch {} into {} due to conflict in paths {}", toMerge, target, result.getConflicts().keySet());
     return MergeCommandResult.failure(result.getConflicts().keySet());
   }
-
-  MergeCommandResult aborted() {
-    MergeCommandResult failure = MergeCommandResult.failure(Collections.emptyList());
-    failure.setAborted(true);
-    return failure;
-  }
 }