You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by hs...@apache.org on 2015/04/01 16:17:45 UTC
flink git commit: [tools] Add --abbrev-ref to get the right branch
name of HEAD
Repository: flink
Updated Branches:
refs/heads/master 5691f2626 -> cbc8423e2
[tools] Add --abbrev-ref to get the right branch name of HEAD
Add --abbrev-ref to get the right branch name of HEAD rather than checksum to return back to original branch.
Without it will make merge tool to go to unnamed branch.
Somehow old PR #548 could not be reopen so submit new one. Sorry
Author: Henry Saputra <he...@gmail.com>
Closes #552 from hsaputra/fix_merge_tools_to_get_original_head and squashes the following commits:
98d2d97 [Henry Saputra] [tools] Add --abbrev-ref to get the right branch name of HEAD rather than checksum to return back to original branch.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/cbc8423e
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/cbc8423e
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/cbc8423e
Branch: refs/heads/master
Commit: cbc8423e2bb9ecdc1684539c7065c7f73289ad17
Parents: 5691f26
Author: Henry Saputra <he...@gmail.com>
Authored: Wed Apr 1 07:17:37 2015 -0700
Committer: Henry Saputra <he...@gmail.com>
Committed: Wed Apr 1 07:17:37 2015 -0700
----------------------------------------------------------------------
tools/merge_flink_pr.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/cbc8423e/tools/merge_flink_pr.py
----------------------------------------------------------------------
diff --git a/tools/merge_flink_pr.py b/tools/merge_flink_pr.py
index 25aaec2..76a7694 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():