ruby-changes:59804
From: Hiroshi <ko1@a...>
Date: Sun, 26 Jan 2020 07:42:13 +0900 (JST)
Subject: [ruby-changes:59804] aacd918340 (master): Do not use `git pull` because origin/master was already fetched.
https://git.ruby-lang.org/ruby.git/commit/?id=aacd918340 From aacd918340e20e4556a6369c3f5933226b0bb093 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA <hsbt@r...> Date: Sun, 26 Jan 2020 07:40:56 +0900 Subject: Do not use `git pull` because origin/master was already fetched. diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index c065b9c..07deee6 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -391,12 +391,11 @@ def update_default_gems(gem) https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L391 `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 -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/