(spark) branch master updated: Revert "complete cherry pick in merge script"

[nc...@apache.org]

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 976b87ff4596 Revert "complete cherry pick in merge script"
976b87ff4596 is described below

commit 976b87ff45962de6ed7d16667f2049e8d926559d
Author: Nicholas Chammas <ni...@gmail.com>
AuthorDate: Fri Aug 21 12:03:31 2026 -0400

    Revert "complete cherry pick in merge script"
    
    This reverts commit 3731453175d31125a8765f61d5df2e5936ffb28d.
---
 dev/merge_spark_pr.py | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index f22b4178ebf8..291f09d2635e 100755
--- a/dev/merge_spark_pr.py
+++ b/dev/merge_spark_pr.py
@@ -681,22 +681,8 @@ 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 'git add' conflicting files... Finished?"
+        msg = "Okay, please fix any conflicts and finish the cherry-pick. 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: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org