4a23212102
When merge was changed to run in the background context, the db updates were still running in request context. This means that the merge could be successful but the db not be updated. This PR changes both these to run in the hammer context, this is not complete rollback protection but it's much better. Fix #21332 Signed-off-by: Andrew Thornton <art27@cantab.net> Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> |
||
|---|---|---|
| .. | ||
| check_test.go | ||
| check.go | ||
| commit_status.go | ||
| edits.go | ||
| lfs.go | ||
| main_test.go | ||
| merge.go | ||
| patch_unmerged.go | ||
| patch.go | ||
| pull_test.go | ||
| pull.go | ||
| review.go | ||
| temp_repo.go | ||
| update.go | ||