MarcoBuster
/
gitea
mirror of https://github.com/go-gitea/gitea
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use db.Find instead of FindBranch

This commit is contained in:
yp05327 2024-01-24 08:43:53 +00:00
parent 58dbb670b0
commit ba4406ff2c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
models/git/branch.go
View File

@ -448,7 +448,7 @@ func FindRecentlyPushedNewBranches(ctx context.Context, opts *FindRecentlyPushed
opts.ListOptions.Page = 1
}
findBranchOpts := FindBranchOptions{
branches, err := db.Find[Branch](ctx, FindBranchOptions{
RepoCond: builder.In("branch.repo_id", repoIDs),
CommitCond: builder.Neq{"branch.commit_id": baseBranch.CommitID}, // newly created branch have no changes, so skip them,
PusherID: opts.Actor.ID,
@ -459,13 +459,11 @@ func FindRecentlyPushedNewBranches(ctx context.Context, opts *FindRecentlyPushed
// we can not detect them correctly
PullRequestCond: builder.NotIn("branch.id", prBranchIds),
ListOptions: opts.ListOptions,
}
branches, err := FindBranches(ctx, findBranchOpts)
})
if err != nil {
return nil, err
}
if err := branches.LoadRepo(ctx); err != nil {
if err := BranchList(branches).LoadRepo(ctx); err != nil {
return nil, err
}