Do not use git pull because origin/master was already fetched.

ruby · Jan 25, 2020 · aacd918 · aacd918
1 parent da2d6ca
commit aacd918
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
@@ -391,12 +391,11 @@ def update_default_gems(gem)
       `git co ruby-core/master`
       `git branch ruby-core`
     end
-    `git co ruby-core`
     `git fetch ruby-core master --no-tags`
+    `git co ruby-core`
     `git rebase ruby-core/master`
     `git co master`
-    `git stash`
-    `git pull --rebase`
+    `git rebase origin/master`
   end
 end