Merge branch '2.2.x' into 2.3.x

2020-06-05 16:22:06 -07:00
parent bbb57428cb 97d4613fba
commit 9b95ab26f7
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