root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

KAFKA-2328; merge-kafka-pr.py script should not leave user in a detached branch

This commit is contained in:
Ismael Juma 2015-07-17 17:29:16 +01:00
parent 15cba9f00d
commit ae201dd5ef
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kafka-merge-pr.py
View File

@ -95,8 +95,9 @@ def continue_maybe(prompt):
fail("Okay, exiting") fail("Okay, exiting")
def clean_up(): def clean_up():
print "Restoring head pointer to %s" % original_head if original_head != get_current_branch():
run_cmd("git checkout %s" % original_head) print "Restoring head pointer to %s" % original_head
run_cmd("git checkout %s" % original_head)
branches = run_cmd("git branch").replace(" ", "").split("\n") branches = run_cmd("git branch").replace(" ", "").split("\n")
@ -104,6 +105,8 @@ def clean_up():
print "Deleting local branch %s" % branch print "Deleting local branch %s" % branch
run_cmd("git branch -D %s" % branch) run_cmd("git branch -D %s" % branch)
def get_current_branch():
return run_cmd("git rev-parse --abbrev-ref HEAD").replace("\n", "")
# merge the requested PR and return the merge hash # merge the requested PR and return the merge hash
def merge_pr(pr_num, target_ref, title, body, pr_repo_desc): def merge_pr(pr_num, target_ref, title, body, pr_repo_desc):
@ -350,7 +353,7 @@ def standardize_jira_ref(text):
def main(): def main():
global original_head global original_head
original_head = run_cmd("git rev-parse HEAD")[:8] original_head = get_current_branch()
branches = get_json("%s/branches" % GITHUB_API_BASE) branches = get_json("%s/branches" % GITHUB_API_BASE)
branch_names = filter(lambda x: x.startswith(RELEASE_BRANCH_PREFIX), [x['name'] for x in branches]) branch_names = filter(lambda x: x.startswith(RELEASE_BRANCH_PREFIX), [x['name'] for x in branches])