Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-01 05:09:50 +01:00
Code Issues Packages Projects Releases Activity

do merge commit also without diffs between branches

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-10-15 10:16:26 +02:00
parent c465a48ece
commit bf32f53c2d
3 changed files with 4 additions and 4 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/AbstractGitCommand.java
View File

@@ -214,10 +214,10 @@ class AbstractGitCommand
}
}
Optional<RevCommit> doCommit(String message, Person author) {
Optional<RevCommit> doCommit(String message, Person author, boolean isMergeCommit) {
Person authorToUse = determineAuthor(author);
try {
if (!clone.status().call().isClean()) {
if (isMergeCommit || !clone.status().call().isClean()) {
return of(clone.commit()
.setAuthor(authorToUse.getName(), authorToUse.getMail())
.setMessage(message)

2
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
View File

@@ -99,7 +99,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
private void doCommit() {
logger.debug("merged branch {} into {}", toMerge, target);
doCommit(MessageFormat.format(determineMessageTemplate(), toMerge, target), author);
doCommit(MessageFormat.format(determineMessageTemplate(), toMerge, target), author, true);
}
private String determineMessageTemplate() {

2
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitModifyCommand.java
View File

@@ -62,7 +62,7 @@ public class GitModifyCommand extends AbstractGitCommand implements ModifyComman
r.execute(this);
}
failIfNotChanged(() -> new NoChangesMadeException(repository, ModifyWorker.this.request.getBranch()));
Optional<RevCommit> revCommit = doCommit(request.getCommitMessage(), request.getAuthor());
Optional<RevCommit> revCommit = doCommit(request.getCommitMessage(), request.getAuthor(), false);
push();
return revCommit.orElseThrow(() -> new NoChangesMadeException(repository, ModifyWorker.this.request.getBranch())).name();
}