1
0
Fork 0
forgejo/modules/queue
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
helper.go
manager.go
queue.go
queue_bytefifo.go
queue_channel.go
queue_channel_test.go
queue_disk.go
queue_disk_channel.go
queue_disk_channel_test.go
queue_disk_test.go
queue_redis.go
queue_test.go
queue_wrapped.go
setting.go
unique_queue.go
unique_queue_channel.go
unique_queue_disk.go
unique_queue_disk_channel.go
unique_queue_redis.go
unique_queue_wrapped.go
workerpool.go