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

ruby-changes:57529

From: Kazuhiro <ko1@a...>
Date: Wed, 4 Sep 2019 12:52:01 +0900 (JST)
Subject: [ruby-changes:57529] 967ef0d4f6 (master): Use `git pull` instead of `git fetch` if master branch

https://git.ruby-lang.org/ruby.git/commit/?id=967ef0d4f6

From 967ef0d4f6c84b5c204247a8a960656d6264ef49 Mon Sep 17 00:00:00 2001
From: Kazuhiro NISHIYAMA <zn@m...>
Date: Wed, 4 Sep 2019 12:36:45 +0900
Subject: Use `git pull` instead of `git fetch` if master branch


diff --git a/tool/fetch-bundled_gems.rb b/tool/fetch-bundled_gems.rb
index ae3068d..ba16d72 100755
--- a/tool/fetch-bundled_gems.rb
+++ b/tool/fetch-bundled_gems.rb
@@ -19,7 +19,11 @@ end https://github.com/ruby/ruby/blob/trunk/tool/fetch-bundled_gems.rb#L19
 
 if File.directory?(n)
   puts "updating #{n} ..."
-  system(*%W"git fetch", chdir: n) or abort
+  if v == "master"
+    system(*%W"git pull", chdir: n) or abort
+  else
+    system(*%W"git fetch", chdir: n) or abort
+  end
 else
   puts "retrieving #{n} ..."
   system(*%W"git clone #{u} #{n}") or abort
-- 
cgit v0.10.2


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

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