From 4515bcc922376771c56733745c7595e14449b6d8 Mon Sep 17 00:00:00 2001 From: NAKAMURA Usaku Date: Mon, 19 Aug 2019 15:37:28 +0900 Subject: Omit version.h when merging --- tool/merger.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tool/merger.rb') diff --git a/tool/merger.rb b/tool/merger.rb index 7405948198..228faeff2c 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -316,11 +316,11 @@ else if resp.code != '200' abort "'#{git_uri}' returned status '#{resp.code}':\n#{resp.body}" end - patch = resp.body + 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")}" puts '+ git apply' - IO.popen(['git', 'apply'], 'w') { |f| f.write(patch) } + IO.popen(['git', 'apply'], 'wb') { |f| f.write(patch) } else default_merge_branch = (%r{^URL: .*/branches/ruby_1_8_} =~ `svn info` ? 'branches/ruby_1_8' : 'trunk') svn_src = "#{Merger::REPOS}#{ARGV[1] || default_merge_branch}" -- cgit v1.2.1