[前][次][番号順一覧][スレッド一覧]

ruby-changes:60713

From: Hiroshi <ko1@a...>
Date: Thu, 9 Apr 2020 18:25:01 +0900 (JST)
Subject: [ruby-changes:60713] 55a5a4bc03 (master): Fixed to initialize ruby-core repository when it has no master branch

https://git.ruby-lang.org/ruby.git/commit/?id=55a5a4bc03

From 55a5a4bc03de1027dca359d50e23ee57c2224353 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Thu, 9 Apr 2020 18:23:49 +0900
Subject: Fixed to initialize ruby-core repository when it has no master branch


diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index 63cf0a1..d034e72 100644
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -440,14 +440,16 @@ def update_default_gems(gem) https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L440
   Dir.chdir("../../#{author}/#{repository}") do
     unless `git remote`.match(/ruby\-core/)
       `git remote add ruby-core git@g...:ruby/ruby.git`
-      `git fetch ruby-core --no-tags`
+    end
+    `git fetch ruby-core master --no-tags`
+    unless `git branch`.match(/ruby\-core/)
       `git co ruby-core/master`
       `git branch ruby-core`
     end
-    `git fetch ruby-core master --no-tags`
     `git co ruby-core`
     `git rebase ruby-core/master`
     `git co master`
+    `git fetch origin master`
     `git rebase origin/master`
   end
 end
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]