Browse Source
Always set the merge base used to merge the commit (#15352) (#15385)
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.netmj-v1.14.3
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 45 additions and 8 deletions
-
20integrations/api_helper_for_declarative_test.go
-
20integrations/git_test.go
-
3models/pull.go
-
8modules/queue/manager.go
-
2services/pull/merge.go
Write
Preview
Loading…
Cancel
Save
Reference in new issue