This is an automated email from the ASF dual-hosted git repository.
nchammas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 3731453175d3 complete cherry pick in merge script
3731453175d3 is described below
commit 3731453175d31125a8765f61d5df2e5936ffb28d
Author: Nicholas Chammas <[email protected]>
AuthorDate: Fri Aug 21 11:25:12 2026 -0400
complete cherry pick in merge script
---
dev/merge_spark_pr.py | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index 291f09d2635e..f22b4178ebf8 100755
--- a/dev/merge_spark_pr.py
+++ b/dev/merge_spark_pr.py
@@ -681,8 +681,22 @@ def _do_cherry_pick(pr_num, merge_hash, pick_ref):
except Exception as e:
msg = "Error cherry-picking: %s\nWould you like to manually fix-up
this merge?" % e
continue_maybe(msg, True)
- msg = "Okay, please fix any conflicts and finish the cherry-pick.
Finished?"
+ msg = "Okay, please fix any conflicts and 'git add' conflicting
files... Finished?"
continue_maybe(msg, True)
+ # Finish the pick here so the committer never runs `cherry-pick
--continue`
+ # (that opens an editor and defaults to --cleanup=strip, which drops
lines
+ # that begin with '#'). Match the no-editor path used for clean picks
and
+ # for conflicted squash-merges above.
+ run_cmd(
+ [
+ "git",
+ "-c",
+ "commit.cleanup=whitespace",
+ "cherry-pick",
+ "--continue",
+ "--no-edit",
+ ]
+ )
continue_maybe(
"Pick complete (local ref %s). Push to %s?" % (pick_branch_name,
PUSH_REMOTE_NAME)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
