diff options
| author | NARUSE, Yui <[email protected]> | 2024-04-23 20:14:41 +0900 |
|---|---|---|
| committer | NARUSE, Yui <[email protected]> | 2024-04-23 20:14:41 +0900 |
| commit | 3fadd68452e88bf5e6eafb429a77dcb7779abbb7 (patch) | |
| tree | 3f4d8a59245a89931c077f47d83fd8ff5c761ec4 | |
| parent | 0b4bf05985d29d3edcb65629663fb6063261b343 (diff) | |
Remove newlines of MIME encoded subject line
| -rwxr-xr-x | tool/merger.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tool/merger.rb b/tool/merger.rb index 46b0f13fc0..0d9957074f 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -324,7 +324,10 @@ else end patch = resp.body.sub(/^diff --git a\/version\.h b\/version\.h\nindex .*\n--- a\/version\.h\n\+\+\+ b\/version\.h\n@@ .* @@\n(?:[-\+ ].*\n|\n)+/, '') - message = "\n\n#{(patch[/^Subject: (.*)\n\ndiff --git/m, 1] || "Message not found for revision: #{git_rev}\n")}" + message = "#{(patch[/^Subject: (.*)\n---\n /m, 1] || "Message not found for revision: #{git_rev}\n")}" + message.gsub!(/\G(.*)\n( .*)/, "\\1\\2") + message = "\n\n#{message}" + puts '+ git apply' IO.popen(['git', 'apply', '--3way'], 'wb') { |f| f.write(patch) } else |