From d09ab8483c0acd207a3fd0f26da974e248c34e79 Mon Sep 17 00:00:00 2001 From: shizhendong Date: Fri, 18 Oct 2024 15:11:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20branch=20=E5=88=97=E8=A1=A8=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E6=B7=BB=E5=8A=A0=20'default',=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=BA=E9=BB=98=E8=AE=A4=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asw/module/app/service/impl/GitServiceImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 f891411..c6c93a1 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 @@ -126,11 +126,17 @@ public class GitServiceImpl implements IGitService { File repoDir = this.getRepoDirPath(workspaceId); try (Git git = this.getGitInstance(repoDir)) { -// List call = git.branchList().setListMode(ListBranchCommand.ListMode.ALL).call(); + Repository repository = git.getRepository(); + String fullBranch = repository.getFullBranch(); + + String defaultBranch = "main"; + if (fullBranch != null && fullBranch.startsWith(LOCAL_BRANCH_PREFIX)) { + defaultBranch = fullBranch.substring(LOCAL_BRANCH_PREFIX.length()); + } // 默认行为，进查询本地分支 List call = git.branchList().call(); - RevWalk revCommits = new RevWalk(git.getRepository()); + RevWalk revCommits = new RevWalk(repository); for (Ref ref : call) { String branchName = ref.getName(); @@ -144,6 +150,7 @@ public class GitServiceImpl implements IGitService { Map m = T.MapUtil.builder() .put("name", branchName) + .put("default", T.StrUtil.equals(defaultBranch, branchName)) .build(); RevCommit commit = revCommits.parseCommit(ref.getObjectId());