[SPARK-58944][INFRA] Complete cherry pick as part of merge script - #58214
Open
nchammas wants to merge 2 commits into
Open
[SPARK-58944][INFRA] Complete cherry pick as part of merge script#58214nchammas wants to merge 2 commits into
nchammas wants to merge 2 commits into
Conversation
nchammas
changed the title
nchammas
marked this pull request as ready for review
August 23, 2026 02:40
uros-b
approved these changes
Aug 23, 2026
Member
|
Thank you @nchammas! |
HyukjinKwon
approved these changes
Aug 24, 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
3 participants
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.
What changes were proposed in this pull request?
When a conflict occurs on cherry picking a commit to a branch, ask the user to fix the conflict but have the script continue the cherry pick itself.
Why are the changes needed?
If the user calls
git cherry-pick --continuethemselves, commit message lines starting with#will be interpreted as comments and stripped. This is what happened to me here. Compare the commit message on 9a75a1d (master) to 8cc56ea (branch-4.x) and note how every line beginning with#was stripped from the latter.I'm not the only one who has hit this. It seems this has been happening for a while.
Cherry-Pick Commit Message Loss Cases
In all of these cases, the
branch-4xcommit messages are malformed relative to the originals frommaster.mastersourcebranch-4.xbackportDoes this PR introduce any user-facing change?
No.
How was this patch tested?
I used this test script to confirm that
commit.cleanup=scissorspreserves Markdown headings and other lines that begin with#when there is a cherry pick conflict.test-cherry-pick-commit-msg.sh
Was this patch authored or co-authored using generative AI tooling?
I wrote this with assistance from GitHub Copilot.