Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-10-31 18:46:07 +01:00
Code Issues Packages Projects Releases Activity

update CHANGELOG.md

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-09-25 10:00:14 +02:00
parent f5060f9d16
commit f0db57faed
2 changed files with 3 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() {
logger.debug("merged branch {} into {}", branchToMerge, targetBranch);
return doCommit(determineMessageTemplate(), author, sign);
return doCommit(determineMessage(), author, sign);
}
MergeCommandResult createSuccessResult(String newRevision) {
@@ -105,7 +105,7 @@ abstract class GitMergeStrategy extends AbstractGitCommand.GitCloneWorker<MergeC
return revisionToMerge;
}
private String determineMessageTemplate() {
private String determineMessage() {
if (Strings.isNullOrEmpty(messageTemplate)) {
return MessageFormat.format(MERGE_COMMIT_MESSAGE_TEMPLATE, branchToMerge, targetBranch);
} else {