gfwleak/appsketch-works-asw-controller
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 调整 mr merge 提交信息

Browse Source
This commit is contained in:
shizhendong
2024-11-15 15:52:48 +08:00
parent 7f7d0347ce
commit 489e1b9320
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java
View File

@@ -251,7 +251,11 @@ public class ApplicationMergeServiceImpl extends ServiceImpl<ApplicationMergeDao
String srcBranch = entity.getSourceBranch(); String srcBranch = entity.getSourceBranch();
String tgtBranch = entity.getTargetBranch(); String tgtBranch = entity.getTargetBranch();
String message = entity.getTitle(); StringBuilder commitMessage = new StringBuilder();
commitMessage.append("Merge branch '").append(tgtBranch).append("' into '").append(srcBranch).append("'\n\n");
commitMessage.append(entity.getTitle());
commitMessage.append("\n");
String workspaceId = entity.getWorkspaceId(); String workspaceId = entity.getWorkspaceId();
// 检查 tgtBranch 是否存在 // 检查 tgtBranch 是否存在
@@ -261,7 +265,7 @@ public class ApplicationMergeServiceImpl extends ServiceImpl<ApplicationMergeDao
// merge // merge
try { try {
gitService.mergeBranch(workspaceId, srcBranch, tgtBranch, message, null); gitService.mergeBranch(workspaceId, srcBranch, tgtBranch, commitMessage.toString(), null);
String latestCommitId = gitService.getLatestCommitId(workspaceId, srcBranch); String latestCommitId = gitService.getLatestCommitId(workspaceId, srcBranch);
entity.setEndCommitId(latestCommitId); entity.setEndCommitId(latestCommitId);
entity.setStatus(MergeRequestStatus.MERGED.toString()); entity.setStatus(MergeRequestStatus.MERGED.toString());