This is an automated email from the ASF dual-hosted git repository.
zhengruifeng 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 eb3d853db895 Revert "[SPARK-57795][INFRA][FOLLOWUP] Refine the merge
summary comment in merge_spark_pr.py"
eb3d853db895 is described below
commit eb3d853db895b110fb3bd2e63922cc6cf7c24aec
Author: Ruifeng Zheng <[email protected]>
AuthorDate: Wed Jul 1 19:38:17 2026 +0800
Revert "[SPARK-57795][INFRA][FOLLOWUP] Refine the merge summary comment in
merge_spark_pr.py"
https://github.com/apache/spark/pull/56923 was unintentionally merged into
master, let me revert it
Closes #56924 from zhengruifeng/revert-merge-summary-format.
Authored-by: Ruifeng Zheng <[email protected]>
Signed-off-by: Ruifeng Zheng <[email protected]>
---
dev/merge_spark_pr.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index 6337e555a773..f16740f2720c 100755
--- a/dev/merge_spark_pr.py
+++ b/dev/merge_spark_pr.py
@@ -450,7 +450,7 @@ def post_merge_comment(pr_num, merged_commits):
"- merged into %s %s/%s" % (ref, GITHUB_COMMIT_BASE, commit_hash)
for ref, commit_hash in merged_commits
]
- body = "**Merge Summary:**\n" + "\n".join(lines) + "\n\n*Posted by
`merge_spark_pr.py`*"
+ body = "**Merge summary** (posted by `merge_spark_pr.py`):\n" +
"\n".join(lines)
print("Posting merge comment on PR #%s:\n%s" % (pr_num, body))
if not GITHUB_OAUTH_KEY:
print_error("GITHUB_OAUTH_KEY is not set; skipping the merge comment.")
@@ -560,7 +560,7 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc,
pr_author, co_author
clean_up()
print_error("Exception while pushing: %s" % e)
- merge_hash = run_cmd("git rev-parse %s" % target_branch_name).strip()
+ merge_hash = run_cmd("git rev-parse %s" % target_branch_name)[:8]
clean_up()
print("Pull request #%s merged!" % pr_num)
print("Merge hash: %s" % merge_hash)
@@ -594,7 +594,7 @@ def _do_cherry_pick(pr_num, merge_hash, pick_ref):
except Exception as e:
fail("Exception while pushing: %s" % e)
- pick_hash = run_cmd("git rev-parse %s" % pick_branch_name).strip()
+ pick_hash = run_cmd("git rev-parse %s" % pick_branch_name)[:8]
clean_up()
print("Pull request #%s picked into %s!" % (pr_num, pick_ref))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
