diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2022-11-13 04:18:50 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-12 21:18:50 +0100 |
| commit | 34283a74e85278fed2c9b70d6f8749dc6a4001ca (patch) | |
| tree | f8fa43399cb723d55efc34dacf7947faf0ed5acf /models/git/branches.go | |
| parent | a0a425a13ba587829a831aaecd8469d39d372111 (diff) | |
| download | gitea-34283a74e85278fed2c9b70d6f8749dc6a4001ca.tar.gz gitea-34283a74e85278fed2c9b70d6f8749dc6a4001ca.zip | |
Allow detect whether it's in a database transaction for a context.Context (#21756)
Fix #19513
This PR introduce a new db method `InTransaction(context.Context)`,
and also builtin check on `db.TxContext` and `db.WithTx`.
There is also a new method `db.AutoTx` has been introduced but could be used by other PRs.
`WithTx` will always open a new transaction, if a transaction exist in context, return an error.
`AutoTx` will try to open a new transaction if no transaction exist in context.
That means it will always enter a transaction if there is no error.
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: 6543 <6543@obermui.de>
Diffstat (limited to 'models/git/branches.go')
| -rw-r--r-- | models/git/branches.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/models/git/branches.go b/models/git/branches.go index b17d762dbe..328f6f0f0d 100644 --- a/models/git/branches.go +++ b/models/git/branches.go @@ -544,7 +544,7 @@ func FindRenamedBranch(repoID int64, from string) (branch *RenamedBranch, exist // RenameBranch rename a branch func RenameBranch(repo *repo_model.Repository, from, to string, gitAction func(isDefault bool) error) (err error) { - ctx, committer, err := db.TxContext() + ctx, committer, err := db.TxContext(db.DefaultContext) if err != nil { return err } |