From 81d58ae8680e2f08db7f692d16900274e28b5201 Mon Sep 17 00:00:00 2001
From: shizhendong <shizhendong@zdjizhi.com>
Date: Thu, 14 Nov 2024 17:22:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20ASW-167=20=E8=A7=A3=E5=86=B3=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E4=BB=93=E5=BA=93=20=E5=88=87=E6=8D=A2main=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=20=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/app/service/impl/ApplicationMergeServiceImpl.java | 5 +++--
 .../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)