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());