Fix typo in forward-merge script
This commit is contained in:
parent
81a57944b1
commit
c72dd7de1a
@ -38,9 +38,9 @@ def rewrite_message(message_file, fixed)
|
|||||||
if from_branch.include? "/"
|
if from_branch.include? "/"
|
||||||
from_branch = from_branch.partition("/").last
|
from_branch = from_branch.partition("/").last
|
||||||
end
|
end
|
||||||
to_brach = match[2]
|
to_branch = match[2]
|
||||||
$log.debug "Rewriting merge message"
|
$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
|
end
|
||||||
if fixed and line.start_with?("#")
|
if fixed and line.start_with?("#")
|
||||||
$log.debug "Adding fixed"
|
$log.debug "Adding fixed"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user