summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKazuhiro NISHIYAMA <zn@mbf.nifty.com>2019-09-04 12:36:45 +0900
committerKazuhiro NISHIYAMA <zn@mbf.nifty.com>2019-09-04 12:46:26 +0900
commit967ef0d4f6c84b5c204247a8a960656d6264ef49 (patch)
tree5932b887f270f085dff7f1048c270fc22915b523
parent1e30d0af7d0258bd3a9e6b072e6517f8db78f853 (diff)
Use `git pull` instead of `git fetch` if master branch
-rwxr-xr-xtool/fetch-bundled_gems.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/tool/fetch-bundled_gems.rb b/tool/fetch-bundled_gems.rb
index ae3068d35c..ba16d726fd 100755
--- a/tool/fetch-bundled_gems.rb
+++ b/tool/fetch-bundled_gems.rb
@@ -19,7 +19,11 @@ end
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