diff --git a/scripts/update_submodule.py b/scripts/update_submodule.py index 9561d916dabc26cd238182dd86ca7819ea91bd76..ff8ee342ce5056bc576cd09ae39ba5f3b65d8ac9 100755 --- a/scripts/update_submodule.py +++ b/scripts/update_submodule.py @@ -241,12 +241,15 @@ def update_submodule_and_include_ref( return None, None, None, None, None logging.debug("New commits: %s", commits) - # Find out if top commit is part of a merge request + # Find out if top commit is top commit of a merge request # If so, use source branch of this MR as integration branch name # Else use commit sha instead integration_branch_suffix = new_revision for mr in commits[0].merge_requests(): - if mr["target_branch"] == submodule_project.default_branch: + if ( + mr["target_branch"] == submodule_project.default_branch + and mr["sha"] == new_revision + ): integration_branch_suffix = mr["source_branch"] break logging.debug("Integration branch suffix: %s", integration_branch_suffix)