Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-04 20:45:52 +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

1
CHANGELOG.md
View File

@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Handling of branch with slashes in source view ([#1340](https://github.com/scm-manager/scm-manager/pull/1340)) - Handling of branch with slashes in source view ([#1340](https://github.com/scm-manager/scm-manager/pull/1340))
- Detect not existing paths correctly in Mercurial ([#1343](https://github.com/scm-manager/scm-manager/pull/1343)) - Detect not existing paths correctly in Mercurial ([#1343](https://github.com/scm-manager/scm-manager/pull/1343))
- Return correct revisions for tags in hooks for git repositories ([#1344](https://github.com/scm-manager/scm-manager/pull/1344)) - Return correct revisions for tags in hooks for git repositories ([#1344](https://github.com/scm-manager/scm-manager/pull/1344))
- Do not handle manual merge commit messages as templates ([#1351](https://github.com/scm-manager/scm-manager/pull/1351))
## [2.5.0] - 2020-09-10 ## [2.5.0] - 2020-09-10
### Added ### Added

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(determineMessageTemplate(), author, sign); return doCommit(determineMessage(), author, sign);
} }
MergeCommandResult createSuccessResult(String newRevision) { MergeCommandResult createSuccessResult(String newRevision) {
@@ -105,7 +105,7 @@ abstract class GitMergeStrategy extends AbstractGitCommand.GitCloneWorker<MergeC
return revisionToMerge; return revisionToMerge;
} }
private String determineMessageTemplate() { private String determineMessage() {
if (Strings.isNullOrEmpty(messageTemplate)) { if (Strings.isNullOrEmpty(messageTemplate)) {
return MessageFormat.format(MERGE_COMMIT_MESSAGE_TEMPLATE, branchToMerge, targetBranch); return MessageFormat.format(MERGE_COMMIT_MESSAGE_TEMPLATE, branchToMerge, targetBranch);
} else { } else {