Skip to content

Commit

Permalink
Fix bug for ctx usage (#26762)
Browse files Browse the repository at this point in the history
Regression from #26158

Fix #26684
  • Loading branch information
lunny committed Aug 28, 2023
1 parent 67daa7b commit 6945918
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions modules/repository/branch.go
Expand Up @@ -106,23 +106,23 @@ func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository,
return int64(len(allBranches)), nil
}

if err := db.WithTx(ctx, func(subCtx context.Context) error {
if err := db.WithTx(ctx, func(ctx context.Context) error {
if len(toAdd) > 0 {
if err := git_model.AddBranches(subCtx, toAdd); err != nil {
if err := git_model.AddBranches(ctx, toAdd); err != nil {
return err
}
}

for _, b := range toUpdate {
if _, err := db.GetEngine(subCtx).ID(b.ID).
if _, err := db.GetEngine(ctx).ID(b.ID).
Cols("commit_id, commit_message, pusher_id, commit_time, is_deleted").
Update(b); err != nil {
return err
}
}

if len(toRemove) > 0 {
if err := git_model.DeleteBranches(subCtx, repo.ID, doerID, toRemove); err != nil {
if err := git_model.DeleteBranches(ctx, repo.ID, doerID, toRemove); err != nil {
return err
}
}
Expand Down
4 changes: 2 additions & 2 deletions services/pull/review.go
Expand Up @@ -333,9 +333,9 @@ func DismissApprovalReviews(ctx context.Context, doer *user_model.User, pull *is
return err
}

return db.WithTx(ctx, func(subCtx context.Context) error {
return db.WithTx(ctx, func(ctx context.Context) error {
for _, review := range reviews {
if err := issues_model.DismissReview(subCtx, review, true); err != nil {
if err := issues_model.DismissReview(ctx, review, true); err != nil {
return err
}

Expand Down

0 comments on commit 6945918

Please sign in to comment.