Fix branch list bug which displayed default branch twice (go-gitea#28878

) Fix go-gitea#28876
henrygoodman · Jan 31, 2024 · 77c1eac · 77c1eac
1 parent 07b230a
commit 77c1eac
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/services/repository/branch.go b/services/repository/branch.go
@@ -65,16 +65,15 @@ func LoadBranches(ctx context.Context, repo *repo_model.Repository, gitRepo *git
 			Page:     page,
 			PageSize: pageSize,
 		},
-		Keyword: keyword,
+		Keyword:            keyword,
+		ExcludeBranchNames: []string{repo.DefaultBranch},
 	}
 
 	dbBranches, totalNumOfBranches, err := db.FindAndCount[git_model.Branch](ctx, branchOpts)
 	if err != nil {
 		return nil, nil, 0, err
 	}
 
-	branchOpts.ExcludeBranchNames = []string{repo.DefaultBranch}
-
 	if err := git_model.BranchList(dbBranches).LoadDeletedBy(ctx); err != nil {
 		return nil, nil, 0, err
 	}