1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sync_default_gems.rb: do not reset the whole directory [ci skip]

Browse Source 
If no files to be ignored, resetting with no argument means
resetting the whole directory.
This commit is contained in:
Nobuyoshi Nakada 2021-04-08 12:04:25 +09:00
parent cdc0cdc77f
commit 956056db37
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tool/sync_default_gems.rb
View File

@ -439,7 +439,7 @@ def sync_default_gems_with_commits(gem, ranges, edit: nil)
system(*%W"git reset HEAD --", *ignore) system(*%W"git reset HEAD --", *ignore)
File.unlink(*ignore) File.unlink(*ignore)
ignore = IO.popen(%W"git status --porcelain" + ignore, &:readlines).map! {|line| line[/^.. (.*)/, 1]} 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 end
unless conflict.empty? unless conflict.empty?
if edit if edit