Skip to content

operations: Fix wrong ordering of merge parents for UserMergeBranch

Patrick Steinhardt requested to merge pks-go-user-merge-branch-reversed-parents into master

While our tests do verify that generated merge commits from UserMergeBranch have expected merge parents, the order isn't verified at all. Unfortunately, ordering is important and not checking it has allowed us to sneak in a bug in the Go implementation which ordered parents the wrong way.

Fix the test to verify order and fix the Go implementation to order merge parents correctly.

Merge request reports