From f5060f9d169810ecfd4bd9f4a007f7c9f21ae1ff Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Fri, 25 Sep 2020 09:46:52 +0200
Subject: [PATCH] fix message templating

---
 .../main/java/sonia/scm/repository/spi/GitMergeStrategy.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 72a3f23b5f..2409b347d0 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
@@ -90,7 +90,7 @@ abstract class GitMergeStrategy extends AbstractGitCommand.GitCloneWorker<MergeC
 
   Optional<RevCommit> doCommit() {
     logger.debug("merged branch {} into {}", branchToMerge, targetBranch);
-    return doCommit(MessageFormat.format(determineMessageTemplate(), branchToMerge, targetBranch), author, sign);
+    return doCommit(determineMessageTemplate(), author, sign);
   }
 
   MergeCommandResult createSuccessResult(String newRevision) {
@@ -107,7 +107,7 @@ abstract class GitMergeStrategy extends AbstractGitCommand.GitCloneWorker<MergeC
 
   private String determineMessageTemplate() {
     if (Strings.isNullOrEmpty(messageTemplate)) {
-      return MERGE_COMMIT_MESSAGE_TEMPLATE;
+      return MessageFormat.format(MERGE_COMMIT_MESSAGE_TEMPLATE, branchToMerge, targetBranch);
     } else {
       return messageTemplate;
     }