Skip to content

[SPARK-58944][INFRA][FOLLOWUP] Handle manually completed cherry-picks #58521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhengruifeng wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −12
Open

[SPARK-58944][INFRA][FOLLOWUP] Handle manually completed cherry-picks #58521

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions dev/merge_spark_pr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,6 +779,7 @@ def _do_cherry_pick(pr_num, merge_hash, pick_ref):

git.run("git fetch %s %s:%s" % (PUSH_REMOTE_NAME, pick_ref, pick_branch_name))
git.run("git checkout %s" % pick_branch_name)
pick_head = git.run("git rev-parse HEAD").strip()

try:
git.run(
Expand All @@ -796,18 +797,21 @@ def _do_cherry_pick(pr_num, merge_hash, pick_ref):
continue_maybe(msg, True)
msg = "Okay, please fix any conflicts and 'git add' conflicting files... Finished?"
continue_maybe(msg, True)
# Important to use `scissors` and `--edit` otherwise git will strip lines starting with `#`
# when calling `--continue`. See: https://github.com/apache/spark/pull/58214
git.run(
[
"git",
"-c",
"commit.cleanup=scissors",
"cherry-pick",
"--continue",
"--edit",
]
)
if git.run("git rev-parse HEAD").strip() == pick_head:
# Important to use `scissors` and `--edit` otherwise git will strip lines starting
# with `#` when calling `--continue`. See: https://github.com/apache/spark/pull/58214
git.run(
[
"git",
"-c",
"commit.cleanup=scissors",
"cherry-pick",
"--continue",
"--edit",
]
)
else:
print("Cherry-pick already completed manually; continuing with the backport.")

continue_maybe(
"Pick complete (local ref %s). Push to %s?" % (pick_branch_name, PUSH_REMOTE_NAME)
Expand Down