summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authorTakashi Kokubun <takashikkbn@gmail.com>2023-09-01 16:02:23 -0700
committerTakashi Kokubun <takashikkbn@gmail.com>2023-09-01 16:17:59 -0700
commit00f263e6c4cc709e5bdcce2c903c12f5d76f8a37 (patch)
treeb206796b1d418d688b446eec09c4ae14524f4b04 /tool
parentc666077182e3408a6b8a3e83789f60d6cee30c70 (diff)
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.
Diffstat (limited to 'tool')
-rwxr-xr-xtool/sync_default_gems.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index 2879ff6081..fcfb06047e 100755
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -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