Skip to content

The Unified and Autonomous Development Platform

Use different default commit message for different merge strategy

robin shencbd9c99ea8e2
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
index e2e478939d..03492be941 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
@@ -247,13 +247,13 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
MergeStrategy strategy = request.getMergeStrategy();
if ((strategy == ALWAYS_MERGE || strategy == MERGE_IF_NECESSARY || strategy == SQUASH_MERGE)
&& !preview.getMerged().equals(preview.getRequestHead())
- && !mergedCommit.getFullMessage().equals(request.getCommitMessage())) {
+ && !mergedCommit.getFullMessage().equals(request.getCommitMessage(strategy))) {
try ( RevWalk revWalk = new RevWalk(targetProject.getRepository());
ObjectInserter inserter = targetProject.getRepository().newObjectInserter()) {
CommitBuilder newCommit = new CommitBuilder();
newCommit.setAuthor(mergedCommit.getAuthorIdent());
newCommit.setCommitter(committer);
- newCommit.setMessage(request.getCommitMessage());
+ newCommit.setMessage(request.getCommitMessage(strategy));
newCommit.setTreeId(mergedCommit.getTree());
newCommit.setParentIds(mergedCommit.getParents());
mergedId = inserter.insert(newCommit);
@@ -542,11 +542,11 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
if (mergePreview.getMergeStrategy() == REBASE_MERGE) {
merged = GitUtils.rebase(repositoryRef.get(), requestHeadId, targetHeadId, user);
} else if (mergePreview.getMergeStrategy() == SQUASH_MERGE) {
- merged = GitUtils.merge(repositoryRef.get(),
- requestHeadId, targetHeadId, true, user, request.getCommitMessage());
+ merged = GitUtils.merge(repositoryRef.get(), requestHeadId, targetHeadId, true, user,
+ request.getCommitMessage(mergePreview.getMergeStrategy()));
} else {
merged = GitUtils.merge(repositoryRef.get(), requestHeadId, targetHeadId, false, user,
- request.getCommitMessage());
+ request.getCommitMessage(mergePreview.getMergeStrategy()));
}
RefUpdate refUpdate = GitUtils.getRefUpdate(repositoryRef.get(), mergeRefRef.get());
diff --git a/core/src/main/java/com/gitplex/server/model/PullRequest.java b/core/src/main/java/com/gitplex/server/model/PullRequest.java
index 600cfd3cf8..888225ffa8 100644
--- a/core/src/main/java/com/gitplex/server/model/PullRequest.java
+++ b/core/src/main/java/com/gitplex/server/model/PullRequest.java
@@ -665,12 +665,18 @@ public class PullRequest extends AbstractEntity {
return commits;
}
- public String getCommitMessage() {
- String commitMessage = getTitle() + "\n\n";
- if (getDescription() != null)
- commitMessage += getDescription() + "\n\n";
- commitMessage += "Merged commit of pull request #" + getNumber();
- return commitMessage;
+ public String getCommitMessage(MergeStrategy mergeStrategy) {
+ if (mergeStrategy == MergeStrategy.SQUASH_MERGE) {
+ String commitMessage = getTitle() + "\n\n";
+ if (getDescription() != null)
+ commitMessage += getDescription() + "\n\n";
+ commitMessage += "Squashed commit of pull request #" + getNumber();
+ return commitMessage;
+ } else if (mergeStrategy == MergeStrategy.ALWAYS_MERGE || mergeStrategy == MergeStrategy.MERGE_IF_NECESSARY) {
+ return "Merge pull request #" + getNumber() + "\n\n" + getTitle();
+ } else {
+ throw new IllegalStateException("Unexpected merge strategy: " + mergeStrategy);
+ }
}
public LastEvent getLastEvent() {