Mirrors/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-09-01 14:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: always defer release

Browse Source
This commit is contained in:
Jason Song 2024-08-30 10:33:45 +08:00 committed by GitHub
parent 860f3ec5a5
commit aa51a8c023
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
services/pull/merge.go
View File

@ -187,7 +187,7 @@ func Merge(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.U
log.Error("lock.Lock(): %v", err)
return fmt.Errorf("lock.Lock: %w", err)
}
defer releaser()
defer func() {
go AddTestPullRequestTask(doer, pr.BaseRepo.ID, pr.BaseBranch, false, "", "")
}()
@ -497,6 +497,7 @@ func MergedManually(ctx context.Context, pr *issues_model.PullRequest, doer *use
log.Error("lock.Lock(): %v", err)
return fmt.Errorf("lock.Lock: %w", err)
}
defer releaser()
err = db.WithTx(ctx, func(ctx context.Context) error {
if err := pr.LoadBaseRepo(ctx); err != nil {

4
services/repository/transfer.go
View File

@ -47,9 +47,9 @@ func TransferOwnership(ctx context.Context, doer, newOwner *user_model.User, rep
log.Error("lock.Lock(): %v", err)
return fmt.Errorf("lock.Lock: %w", err)
}
defer releaser()
if err := transferOwnership(ctx, doer, newOwner.Name, repo); err != nil {
releaser()
return err
}
releaser()
@ -373,9 +373,9 @@ func ChangeRepositoryName(ctx context.Context, doer *user_model.User, repo *repo
log.Error("lock.Lock(): %v", err)
return fmt.Errorf("lock.Lock: %w", err)
}
defer releaser()
if err := changeRepositoryName(ctx, repo, newRepoName); err != nil {
releaser()
return err
}
releaser()