0
0
mirror of https://github.com/go-gitea/gitea.git synced 2025-01-31 07:21:36 +01:00
gitea/services/pull
Giteabot ec3f5f9992
Move database operations of merging a pull request to post receive hook and add a transaction (#30805) (#30888)
Backport #30805 by @lunny

Merging PR may fail because of various problems. The pull request may
have a dirty state because there is no transaction when merging a pull
request. ref
https://github.com/go-gitea/gitea/pull/25741#issuecomment-2074126393

This PR moves all database update operations to post-receive handler for
merging a pull request and having a database transaction. That means if
database operations fail, then the git merging will fail, the git client
will get a fail result.

There are already many tests for pull request merging, so we don't need
to add a new one.

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2024-05-08 14:17:18 +00:00
..
check_test.go
check.go Update misspell to 0.5.1 and add misspellings.csv (#30573) 2024-04-27 08:03:49 +00:00
comment.go Update misspell to 0.5.1 and add misspellings.csv (#30573) 2024-04-27 08:03:49 +00:00
commit_status_test.go Fixing the issue when status check per rule matches multiple actions (#29631) 2024-03-08 05:02:13 +00:00
commit_status.go Use db.ListOptionsAll instead of db.ListOptions{ListAll: true} (#29995) 2024-03-22 13:53:52 +01:00
edits.go
lfs.go
main_test.go
merge_ff_only.go Add merge style fast-forward-only (#28954) 2024-02-12 23:37:23 +01:00
merge_merge.go Add merge style fast-forward-only (#28954) 2024-02-12 23:37:23 +01:00
merge_prepare.go
merge_rebase.go
merge_squash.go
merge_test.go
merge.go Move database operations of merging a pull request to post receive hook and add a transaction (#30805) (#30888) 2024-05-08 14:17:18 +00:00
patch_unmerged.go
patch.go Make sure git version&feature are always prepared (#30877) (#30879) 2024-05-07 02:07:33 +00:00
pull_test.go
pull.go Update misspell to 0.5.1 and add misspellings.csv (#30573) 2024-04-27 08:03:49 +00:00
review_test.go Prevent re-review and dismiss review actions on closed and merged PRs (#30065) 2024-03-28 15:19:24 +00:00
review.go Prevent allow/reject reviews on merged/closed PRs (#30686) 2024-04-27 11:55:03 +00:00
temp_repo.go Make sure git version&feature are always prepared (#30877) (#30879) 2024-05-07 02:07:33 +00:00
update_rebase.go
update.go Move database operations of merging a pull request to post receive hook and add a transaction (#30805) (#30888) 2024-05-08 14:17:18 +00:00