From 0358f1c1035e4648c86b2286ac7e103be32de95b Mon Sep 17 00:00:00 2001 From: Olivier Halligon Date: Mon, 13 Oct 2025 16:50:17 +0200 Subject: [PATCH 1/2] switch out of intermediate branch before deleting it --- .../common/create_release_backmerge_pull_request_action.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/create_release_backmerge_pull_request_action.rb b/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/create_release_backmerge_pull_request_action.rb index 107fe3f07..bcba817dc 100644 --- a/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/create_release_backmerge_pull_request_action.rb +++ b/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/create_release_backmerge_pull_request_action.rb @@ -124,6 +124,7 @@ def self.create_backmerge_pr(api_url:, token:, repository:, title:, head_branch: # When a callback was provided, do the pre-check about valid PR _only_ at that point, in case the callback added new commits unless can_merge?(intermediate_branch, into: base_branch) UI.error("Nothing to merge from #{intermediate_branch} into #{base_branch}. Skipping PR creation.") + Action.sh('git', 'checkout', head_branch) # Switch to original branch so we can delete the intermediate branch Fastlane::Helper::GitHelper.delete_local_branch_if_exists!(intermediate_branch) return nil end From 614f0558e2441d73e24af6f0a699bf3ef33e151c Mon Sep 17 00:00:00 2001 From: Olivier Halligon Date: Mon, 13 Oct 2025 16:53:31 +0200 Subject: [PATCH 2/2] Add CHANGELOG entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07f5a5fe0..aabc22d51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ _None_ ### Bug Fixes -_None_ +- Fix a bug in `create_release_backmerge_pull_request` when you pass a `intermediate_branch_created_callback` callback but there's ultimately nothing to merge. [#665] ### Internal Changes