From 98d2d970d91ea5c795621099baa36480aa02b39f Mon Sep 17 00:00:00 2001 From: Henry Saputra Date: Mon, 30 Mar 2015 17:06:36 -0700 Subject: [PATCH] [tools] Add --abbrev-ref to get the right branch name of HEAD rather than checksum to return back to original branch. Remove trailing newline in original branch name. --- tools/merge_flink_pr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/merge_flink_pr.py b/tools/merge_flink_pr.py index 25aaec2c7597f..76a7694dc9a53 100755 --- a/tools/merge_flink_pr.py +++ b/tools/merge_flink_pr.py @@ -92,7 +92,7 @@ def continue_maybe(prompt): fail("Okay, exiting") -original_head = run_cmd("git rev-parse HEAD")[:8] +original_head = run_cmd("git rev-parse --abbrev-ref HEAD").rstrip("/\n") def clean_up():