From 3e96d89480e81b338486bd608436cf6f7c38a9e9 Mon Sep 17 00:00:00 2001
From: Konstantin Schaper <konstantin.schaper@cloudogu.com>
Date: Fri, 18 Sep 2020 08:47:04 +0200
Subject: [PATCH] implement requested review changes

---
 .../main/java/sonia/scm/repository/spi/GitMergeRebase.java  | 3 +--
 .../java/sonia/scm/repository/spi/GitMergeCommandTest.java  | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeRebase.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeRebase.java
index d5ba0c49ba..65cba4f7ba 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeRebase.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeRebase.java
@@ -63,7 +63,7 @@ public class GitMergeRebase extends GitMergeStrategy {
           .setUpstream(targetBranch)
           .call();
     } catch (GitAPIException e) {
-      throw new InternalRepositoryException(getContext().getRepository(), "could not merge branch " + branchToMerge + " into " + targetBranch, e);
+      throw new InternalRepositoryException(getContext().getRepository(), "could not rebase branch " + branchToMerge + " onto " + targetBranch, e);
     }
 
     if (result.getStatus().isSuccessful()) {
@@ -84,7 +84,6 @@ public class GitMergeRebase extends GitMergeStrategy {
       getClone()
         .merge()
         .setFastForward(MergeCommand.FastForwardMode.FF_ONLY)
-        .setCommit(false) // we want to set the author manually
         .include(branchToMerge, sourceRevision)
         .call();
       push();
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
index af9755af3a..84c17a299a 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
@@ -496,7 +496,7 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase {
   }
 
   @Test
-  public void shouldRejectRebaseMergeIfBranchCannotBeRebased() {
+  public void shouldRejectRebaseMergeIfBranchCannotBeRebased() throws IOException, GitAPIException {
     GitMergeCommand command = createCommand();
     MergeCommandRequest request = new MergeCommandRequest();
     request.setTargetBranch("master");
@@ -507,6 +507,10 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase {
     MergeCommandResult mergeCommandResult = command.merge(request);
 
     assertThat(mergeCommandResult.isSuccess()).isFalse();
+    Repository repository = createContext().open();
+    Iterable<RevCommit> commits = new Git(repository).log().add(repository.resolve("master")).setMaxCount(1).call();
+    RevCommit headCommit = commits.iterator().next();
+    assertThat(headCommit.getName()).isEqualTo("fcd0ef1831e4002ac43ea539f4094334c79ea9ec");
 
   }