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

fix message templating

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-09-25 09:46:52 +02:00
parent 9f8f26e055
commit f5060f9d16
1 changed files with 2 additions and 2 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/GitMergeStrategy.java
View File

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