diff options
| author | shizhendong <[email protected]> | 2024-11-14 17:22:51 +0800 |
|---|---|---|
| committer | shizhendong <[email protected]> | 2024-11-14 17:22:51 +0800 |
| commit | 81d58ae8680e2f08db7f692d16900274e28b5201 (patch) | |
| tree | bddb21b867dc42f8789b65f7596a47ef27e29183 | |
| parent | 2db15d0f4efb9937b98d7c20a9744c16fc6416a0 (diff) | |
fix: ASW-167 解决本地仓库 切换main分支 报错问题
| -rw-r--r-- | src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java | 5 | ||||
| -rw-r--r-- | src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java b/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java index 10fe30b..7d388fa 100644 --- a/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java @@ -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()); diff --git a/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java b/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java index ae051c3..01f99ea 100644 --- a/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java @@ -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) |