From c72dd7de1a3eb6c7dec70644c8555debc31ae2cd Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Mon, 16 Jan 2023 13:53:18 +0100 Subject: [PATCH] Fix typo in forward-merge script --- git/hooks/prepare-forward-merge | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git/hooks/prepare-forward-merge b/git/hooks/prepare-forward-merge index afaf4eb5a8..1ab5be3d95 100755 --- a/git/hooks/prepare-forward-merge +++ b/git/hooks/prepare-forward-merge @@ -38,9 +38,9 @@ def rewrite_message(message_file, fixed) if from_branch.include? "/" from_branch = from_branch.partition("/").last end - to_brach = match[2] + to_branch = match[2] $log.debug "Rewriting merge message" - line = "Merge branch '#{from_branch}'" + (to_brach ? " into #{to_brach}\n" : "\n") + line = "Merge branch '#{from_branch}'" + (to_branch ? " into #{to_branch}\n" : "\n") end if fixed and line.start_with?("#") $log.debug "Adding fixed"