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

lunny · web-flow · commit 0e6fd0d1c1e3 · 2024-01-21T22:08:31.000+08:00
Fix #28876
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
 	}

Original file line number	Diff line number	Diff line change
`@@ -65,16 +65,15 @@ func LoadBranches(ctx context.Context, repo repo_model.Repository, gitRepo git`
`65`	`65`	`Page: page,`
`66`	`66`	`PageSize: pageSize,`
`67`	`67`	`},`
`68`		`- Keyword: keyword,`
	`68`	`+ Keyword: keyword,`
	`69`	`+ ExcludeBranchNames: []string{repo.DefaultBranch},`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`dbBranches, totalNumOfBranches, err := db.FindAndCount[git_model.Branch](ctx, branchOpts)`
`72`	`73`	`if err != nil {`
`73`	`74`	`return nil, nil, 0, err`
`74`	`75`	`}`
`75`	`76`
`76`		`- branchOpts.ExcludeBranchNames = []string{repo.DefaultBranch}`
`77`		`-`
`78`	`77`	`if err := git_model.BranchList(dbBranches).LoadDeletedBy(ctx); err != nil {`
`79`	`78`	`return nil, nil, 0, err`
`80`	`79`	`}`