Fix cherry-pick workflow for fork PRs and comment on success#7424
Merged
Conversation
The cherry-pick workflow failed with "fatal: bad object <sha>" when the source PR came from a fork in another account. The job checks out the base repo and only fetches the target branch, so the PR's commits were never present locally and the cherry-pick could not resolve them. Fetch refs/pull/<n>/head before cherry-picking so the PR's original commits are available regardless of which fork they came from. Also comment on the original PR when a cherry-pick succeeds, linking to the newly opened PR. This mirrors the existing failure comment and gives a clear per-target-branch status when a PR is backported to multiple branches.
hehe7318
approved these changes
Jun 5, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
The cherry-pick workflow failed with "fatal: bad object " when the source PR came from a fork in another account. The job checks out the base repo and only fetches the target branch, so the PR's commits were never present locally and the cherry-pick could not resolve them.
Fetch refs/pull//head before cherry-picking so the PR's original commits are available regardless of which fork they came from.
Also comment on the original PR when a cherry-pick succeeds, linking to the newly opened PR. This mirrors the existing failure comment and gives a clear per-target-branch status when a PR is backported to multiple branches.
References
Checklist
developadd the branch name as prefix in the PR title (e.g.[release-3.6]).Please review the guidelines for contributing and Pull Request Instructions.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.