Skip to content

Commit ef09ee5

Browse files
committed
Add new line when rewriting git message
Update the forward merge script to add an additional new line when rewiring the commit message. Prior this this commit, if an additional line immediately followed the "Fixes ... in ..." pattern it would be appended to the end of the rewritten fixes line. Closes gh-16861
1 parent 07ebfc0 commit ef09ee5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git/hooks/forward-merge

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,5 @@ password = config['github']['credentials']['password']
8484
dry_run = config['dry_run']
8585
new_issue_number = create_issue(username, password, repository, forward_merge.issue, title, labels, milestone, forward_merge.milestone, dry_run)
8686
puts "Created gh-#{new_issue_number} for forward port of gh-#{forward_merge.issue} into #{forward_merge.milestone}"
87-
rewritten_message = forward_merge.message.sub(forward_merge.line, "Closes gh-#{new_issue_number}")
87+
rewritten_message = forward_merge.message.sub(forward_merge.line, "Closes gh-#{new_issue_number}\n")
8888
File.write(message_file, rewritten_message)

0 commit comments

Comments
 (0)