Merge branch '2.3.x'

5 years ago · 0cb473d9c9
parent d356a24a07 9b95ab26f7
commit 0cb473d9c9
1 changed files with 1 additions and 1 deletions
--- 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