Fix cherry-pick job for unmerged PRs #56510
Merged
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.
When running this task on an unmerged PR, it will be using the merge commit that GitHub generates for every PR. You can't cherry-pick a merge commit without telling it which side of the merge is the intended base. So, the job fails with:
By specifying
-m 1, we can tell git thatHEAD^1is the merge base (i.e. main), and the cherry-pick will work.