1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Always use git.ruby-lang.org as origin

Browse Source 
naruse sets remote.origin.pushUrl = nonexistent as fail-safe
configuration to avoid accidentally push a new branch to origin.
This commit is contained in:
NARUSE, Yui 2019-11-12 01:00:22 +09:00
parent 45bb6f28db
commit 0ba1ea7fbf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tool/merger.rb
View File

@ -12,6 +12,7 @@ require 'uri'
require 'shellwords' require 'shellwords'
ENV['LC_ALL'] = 'C' ENV['LC_ALL'] = 'C'
ORIGIN = 'git@git.ruby-lang.org:ruby.git'
module Merger module Merger
REPOS = 'svn+ssh://svn@ci.ruby-lang.org/ruby/' REPOS = 'svn+ssh://svn@ci.ruby-lang.org/ruby/'
@ -150,7 +151,7 @@ class << Merger
unless execute('git', 'tag', tagname) unless execute('git', 'tag', tagname)
abort 'specfied tag already exists. check tag name and remove it if you want to force re-tagging' abort 'specfied tag already exists. check tag name and remove it if you want to force re-tagging'
end end
execute('git', 'push', 'origin', tagname, interactive: true) execute('git', 'push', ORIGIN, tagname, interactive: true)
end end
end end
@ -176,7 +177,7 @@ class << Merger
execute('svn', 'rm', '-m', "remove tag #{tagname}", tag_url, interactive: true) execute('svn', 'rm', '-m', "remove tag #{tagname}", tag_url, interactive: true)
else else
execute('git', 'tag', '-d', tagname) execute('git', 'tag', '-d', tagname)
execute('git', 'push', 'origin', ":#{tagname}", interactive: true) execute('git', 'push', ORIGIN, ":#{tagname}", interactive: true)
end end
end end
@ -218,7 +219,7 @@ class << Merger
current_branch = IO.popen(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], &:read).strip current_branch = IO.popen(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], &:read).strip
execute('git', 'add', '.') && execute('git', 'add', '.') &&
execute('git', 'commit', '-F', file) && execute('git', 'commit', '-F', file) &&
execute('git', 'push', 'origin', current_branch) execute('git', 'push', ORIGIN, current_branch)
end end
end end