mirror of
https://github.com/ruby/ruby.git
synced 2025-08-23 21:14:23 +02:00
sync_default_gems.rb: Deal with conflicts on ignored files
that do not exist in the ruby/ruby side. This resurrects a line that had existed prior to #8329.
This commit is contained in:
parent
c666077182
commit
00f263e6c4
1 changed files with 1 additions and 0 deletions
|
@ -602,6 +602,7 @@ module SyncDefaultGems
|
|||
|
||||
unless ignore.empty?
|
||||
puts "Reset ignored files: #{ignore.join(', ')}"
|
||||
system(*%W"git rm -r --", *ignore)
|
||||
system(*%W"git checkout -f", base, "--", *ignore)
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue