diff options
| -rwxr-xr-x | tool/merger.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tool/merger.rb b/tool/merger.rb index 755e55c967..025a559408 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -316,7 +316,7 @@ else end patch = resp.body - message = "\n\n#{(patch.match(/^Subject: (.*)\n\ndiff --git/m)&.[](1) || "Message not found for revision: #{git_rev}\n")}" + message = "\n\n#{(patch[/^Subject: (.*)\n\ndiff --git/m, 1] || "Message not found for revision: #{git_rev}\n")}" puts '+ git apply' IO.popen(['git', 'apply'], 'w') { |f| f.write(patch) } else |