Skip to content

Commit 6945918

Browse files
authored
Fix bug for ctx usage (#26762)
Regression from #26158 Fix #26684
1 parent 67daa7b commit 6945918

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

modules/repository/branch.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,23 +106,23 @@ func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository,
106106
return int64(len(allBranches)), nil
107107
}
108108

109-
if err := db.WithTx(ctx, func(subCtx context.Context) error {
109+
if err := db.WithTx(ctx, func(ctx context.Context) error {
110110
if len(toAdd) > 0 {
111-
if err := git_model.AddBranches(subCtx, toAdd); err != nil {
111+
if err := git_model.AddBranches(ctx, toAdd); err != nil {
112112
return err
113113
}
114114
}
115115

116116
for _, b := range toUpdate {
117-
if _, err := db.GetEngine(subCtx).ID(b.ID).
117+
if _, err := db.GetEngine(ctx).ID(b.ID).
118118
Cols("commit_id, commit_message, pusher_id, commit_time, is_deleted").
119119
Update(b); err != nil {
120120
return err
121121
}
122122
}
123123

124124
if len(toRemove) > 0 {
125-
if err := git_model.DeleteBranches(subCtx, repo.ID, doerID, toRemove); err != nil {
125+
if err := git_model.DeleteBranches(ctx, repo.ID, doerID, toRemove); err != nil {
126126
return err
127127
}
128128
}

services/pull/review.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,9 +333,9 @@ func DismissApprovalReviews(ctx context.Context, doer *user_model.User, pull *is
333333
return err
334334
}
335335

336-
return db.WithTx(ctx, func(subCtx context.Context) error {
336+
return db.WithTx(ctx, func(ctx context.Context) error {
337337
for _, review := range reviews {
338-
if err := issues_model.DismissReview(subCtx, review, true); err != nil {
338+
if err := issues_model.DismissReview(ctx, review, true); err != nil {
339339
return err
340340
}
341341

0 commit comments

Comments
 (0)