linden123/githaven-fork
1
1
Fork 0
forked from Shiloh/githaven
Code Pull Requests Activity

Fix branch list bug which displayed default branch twice (#28878)

Browse Source 
Fix #28876
This commit is contained in:
Lunny Xiao 2024-01-21 22:08:31 +08:00 committed by GitHub
parent 49d7663929
commit 0e6fd0d1c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
services/repository/branch.go
View File

@ -65,7 +65,8 @@ func LoadBranches(ctx context.Context, repo *repo_model.Repository, gitRepo *git
Page: page, Page: page,
PageSize: pageSize, PageSize: pageSize,
}, },
Keyword: keyword, Keyword: keyword,
ExcludeBranchNames: []string{repo.DefaultBranch},
} }
dbBranches, totalNumOfBranches, err := db.FindAndCount[git_model.Branch](ctx, branchOpts) dbBranches, totalNumOfBranches, err := db.FindAndCount[git_model.Branch](ctx, branchOpts)
@ -73,8 +74,6 @@ func LoadBranches(ctx context.Context, repo *repo_model.Repository, gitRepo *git
return nil, nil, 0, err return nil, nil, 0, err
} }
branchOpts.ExcludeBranchNames = []string{repo.DefaultBranch}
if err := git_model.BranchList(dbBranches).LoadDeletedBy(ctx); err != nil { if err := git_model.BranchList(dbBranches).LoadDeletedBy(ctx); err != nil {
return nil, nil, 0, err return nil, nil, 0, err
} }