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

ruby-changes:65808

From: Nobuyoshi <ko1@a...>
Date: Thu, 8 Apr 2021 12:08:32 +0900 (JST)
Subject: [ruby-changes:65808] 956056db37 (master): sync_default_gems.rb: do not reset the whole directory [ci skip]

https://git.ruby-lang.org/ruby.git/commit/?id=956056db37

From 956056db37c6d1ff0ba17746f81f83729c0fbb6b Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Thu, 8 Apr 2021 12:04:25 +0900
Subject: sync_default_gems.rb: do not reset the whole directory [ci skip]

If no files to be ignored, resetting with no argument means
resetting the whole directory.
---
 tool/sync_default_gems.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index 69ddab6..e10efae 100644
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -439,7 +439,7 @@ def sync_default_gems_with_commits(gem, ranges, edit: nil) https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L439
         system(*%W"git reset HEAD --", *ignore)
         File.unlink(*ignore)
         ignore = IO.popen(%W"git status --porcelain" + ignore, &:readlines).map! {|line| line[/^.. (.*)/, 1]}
-        system(*%W"git checkout HEAD --", *ignore)
+        system(*%W"git checkout HEAD --", *ignore) unless ignore.empty?
       end
       unless conflict.empty?
         if edit
-- 
cgit v1.1


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

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