zeripath 84f5a0bc62 Always set the merge base used to merge the commit (#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 09:27:29 +01:00
..
bytefifo.go	Code Formats, Nits & Unused Func/Var deletions (#15286)	2021-04-09 09:40:34 +02:00
helper.go	Code Formats, Nits & Unused Func/Var deletions (#15286)	2021-04-09 09:40:34 +02:00
manager.go	Always set the merge base used to merge the commit (#15352)	2021-04-10 09:27:29 +01:00
queue.go
queue_bytefifo.go	Code Formats, Nits & Unused Func/Var deletions (#15286)	2021-04-09 09:40:34 +02:00
queue_channel.go
queue_channel_test.go
queue_disk.go	Code Formats, Nits & Unused Func/Var deletions (#15286)	2021-04-09 09:40:34 +02:00
queue_disk_channel.go
queue_disk_channel_test.go
queue_disk_test.go
queue_redis.go	Code Formats, Nits & Unused Func/Var deletions (#15286)	2021-04-09 09:40:34 +02:00
queue_test.go	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
queue_wrapped.go
setting.go	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
unique_queue.go
unique_queue_channel.go
unique_queue_disk.go	Code Formats, Nits & Unused Func/Var deletions (#15286)	2021-04-09 09:40:34 +02:00
unique_queue_disk_channel.go	Prevent race in PersistableChannelUniqueQueue.Has (#14651)	2021-02-13 20:02:09 +01:00
unique_queue_redis.go	Code Formats, Nits & Unused Func/Var deletions (#15286)	2021-04-09 09:40:34 +02:00
unique_queue_wrapped.go
workerpool.go