kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Omit version.h when merging

Browse source
This commit is contained in:
NAKAMURA Usaku 2019-08-19 15:37:28 +09:00
parent c5db4c28f9
commit 4515bcc922
No known key found for this signature in database
GPG key ID: C5FE8AEA64F81259
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tool/merger.rb
View file

@ -316,11 +316,11 @@ else
if resp.code != '200' if resp.code != '200'
abort "'#{git_uri}' returned status '#{resp.code}':\n#{resp.body}" abort "'#{git_uri}' returned status '#{resp.code}':\n#{resp.body}"
end 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")}" message = "\n\n#{(patch[/^Subject: (.*)\n\ndiff --git/m, 1] || "Message not found for revision: #{git_rev}\n")}"
puts '+ git apply' puts '+ git apply'
IO.popen(['git', 'apply'], 'w') { |f| f.write(patch) } IO.popen(['git', 'apply'], 'wb') { |f| f.write(patch) }
else else
default_merge_branch = (%r{^URL: .*/branches/ruby_1_8_} =~ `svn info` ? 'branches/ruby_1_8' : 'trunk') 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}" svn_src = "#{Merger::REPOS}#{ARGV[1] || default_merge_branch}"