From 97d4613fbaa70dca00f392c8e6bdb1e4c7a27cb8 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 5 Jun 2020 16:21:36 -0700 Subject: [PATCH] Refine prepare-forward-merge to detect master --- git/hooks/prepare-forward-merge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/hooks/prepare-forward-merge b/git/hooks/prepare-forward-merge index c27a9c8a22..470e6d0fd5 100755 --- a/git/hooks/prepare-forward-merge +++ b/git/hooks/prepare-forward-merge @@ -25,7 +25,7 @@ def get_fixed_issues() end def rewrite_message(message_file, fixed) - current_branch = `git rev-parse --abbrev-ref HEAD` + current_branch = `git rev-parse --abbrev-ref HEAD`.strip if current_branch == "master" current_branch = $master_branch end