1
1
mirror of https://github.com/go-gitea/gitea synced 2025-01-26 09:34:28 +00:00
zeripath 1fe5fe419e
Always set the merge base used to merge the commit (#15352) (#15385)
Backport #15352

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
2021-04-10 14:08:30 +02:00
..
2020-12-09 01:12:15 +01:00
2020-06-15 16:46:01 -04:00
2020-04-05 07:20:50 +01:00
2020-04-05 07:20:50 +01:00
2020-04-05 07:20:50 +01:00
2020-08-16 23:07:38 -04:00
2020-03-02 00:05:44 +02:00
2020-04-05 07:20:50 +01:00
2021-04-09 12:39:40 +02:00