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

fix: ASW-167 解决本地仓库 切换main分支 报错问题

Browse Source
This commit is contained in:
shizhendong
2024-11-14 17:22:51 +08:00
parent 2db15d0f4e
commit 81d58ae868
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,8 +254,9 @@ public class ApplicationMergeServiceImpl extends ServiceImpl<ApplicationMergeDao
// merge
try {
String commitId = gitService.mergeBranch(workspaceId, srcBranch, tgtBranch, message, null);
entity.setEndCommitId(commitId);
gitService.mergeBranch(workspaceId, srcBranch, tgtBranch, message, null);
String latestCommitId = gitService.getLatestCommitId(workspaceId, srcBranch);
entity.setEndCommitId(latestCommitId);
entity.setStatus(MergeRequestStatus.MERGED.toString());
} catch (Exception e) {
log.error(e, "[newMr] [merge error] [workspaceId: {}] [srcBranch: {}] [tgtBranch: {}] [msg: {}]", workspaceId, srcBranch, tgtBranch, e.getMessage());

2
src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java
View File

@@ -477,7 +477,7 @@ public class GitServiceImpl implements IGitService {
// checout
git.checkout()
.setCreateBranch(true)
.setCreateBranch(T.StrUtil.equals("main", tgtBranch) ? false : true)
.setName(tgtBranch)
.setUpstreamMode(CreateBranchCommand.SetupUpstreamMode.TRACK)
.setStartPoint("origin/" + tgtBranch)