This is an automated email from the ASF dual-hosted git repository.
gurwls223 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark-connect-go.git
The following commit(s) were added to refs/heads/master by this push:
new ce56131 [MINOR] Fix the merge script to work
ce56131 is described below
commit ce56131597dfd555aa24573ca122887757d50a98
Author: Hyukjin Kwon <[email protected]>
AuthorDate: Thu Jun 1 09:12:07 2023 +0900
[MINOR] Fix the merge script to work
---
merge_connect_go_pr.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/merge_connect_go_pr.py b/merge_connect_go_pr.py
index 417c0ff..bb514a8 100755
--- a/merge_connect_go_pr.py
+++ b/merge_connect_go_pr.py
@@ -478,7 +478,11 @@ def main():
branches = get_json("%s/branches" % GITHUB_API_BASE)
branch_names = list(filter(lambda x: x.startswith("branch-"), [x["name"]
for x in branches]))
# Assumes branch names can be sorted lexicographically
- latest_branch = sorted(branch_names, reverse=True)[0]
+ if len(branch_names) == 0:
+ # Remove this when we have a branch. It fails now because we don't
have branch-*.
+ latest_branch = "master"
+ else:
+ latest_branch = sorted(branch_names, reverse=True)[0]
pr_num = input("Which pull request would you like to merge? (e.g. 34): ")
pr = get_json("%s/pulls/%s" % (GITHUB_API_BASE, pr_num))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
