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

..

archiver

…

comments

…

externalaccount

…

gitdiff

Prevent NPE in CommentMustAsDiff if no hunk header (#15199) (#15200)

2021-04-01 15:14:56 -04:00

issue

…

mailer

…

mirror

…

pull

Always set the merge base used to merge the commit (#15352) (#15385)

2021-04-10 14:08:30 +02:00

release

…

repository

…

webhook

…

wiki

…