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

ruby-changes:73091

From: Hiroshi <ko1@a...>
Date: Mon, 29 Aug 2022 09:52:26 +0900 (JST)
Subject: [ruby-changes:73091] 41a275c89a (master): Support main branch for syntax_suggest

https://git.ruby-lang.org/ruby.git/commit/?id=41a275c89a

From 41a275c89ac8064f18d995251b9fb3349a24273b Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Mon, 29 Aug 2022 09:52:09 +0900
Subject: Support main branch for syntax_suggest

---
 tool/sync_default_gems.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index 58813dc656..451e325e5c 100755
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -547,6 +547,12 @@ end https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L547
 def update_default_gems(gem, release: false)
 
   author, repository = REPOSITORIES[gem.to_sym].split('/')
+  default_branch = case gem
+                  when 'syntax_suggest'
+                    "main"
+                  else
+                    "master"
+                  end
 
   puts "Update #{author}/#{repository}"
 
@@ -572,8 +578,8 @@ def update_default_gems(gem, release: false) https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L578
       last_release = `git tag`.chomp.split.delete_if{|v| v =~ /pre|beta/ }.last
       `git checkout #{last_release}`
     else
-      `git checkout master`
-      `git rebase origin/master`
+      `git checkout #{default_branch}`
+      `git rebase origin/#{default_branch}`
     end
   end
 end
-- 
cgit v1.2.1


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

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