Skip to content

Fix diverged from upstream detection with pull_mirror_branch_prefix

Alessio Caiazza requested to merge ac-fix-diverged-pull-mirroring into master

What does this MR do?

The current Repository#diverged_from_upstream? and Repository#up_to_date_with_upstream? implementations don't catch diverged branches when pull_mirror_branch_prefix is set. (see !17368 (merged))

This MR changes how those methods searches commits upstream.

It also adds more tests to the pull_mirror_branch_prefix feature

related to gitlab-com/gl-infra/delivery#472 (closed)

Does this MR meet the acceptance criteria?

Conformity

Performance and Testing

Edited by Alessio Caiazza

Merge request reports