Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x'

Browse Source
This commit is contained in:
Moritz Halbritter 2023-01-16 13:53:25 +01:00
commit 4d2b389248
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git/hooks/prepare-forward-merge
View File

@ -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"