mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-22 12:54:53 -05:00
84f5a0bc62
The issue is that the TestPatch will reset the PR MergeBase - and it is possible for TestPatch to update the MergeBase whilst a merge is ongoing. The ensuing merge will then complete but it doesn't re-set the MergeBase it used to merge the PR. Fixes the intermittent error in git test. Signed-off-by: Andrew Thornton art27@cantab.net |
||
---|---|---|
.. | ||
check.go | ||
check_test.go | ||
commit_status.go | ||
lfs.go | ||
main_test.go | ||
merge.go | ||
patch.go | ||
pull.go | ||
pull_test.go | ||
review.go | ||
temp_repo.go | ||
update.go |