summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
Diffstat (limited to 'tool')
-rwxr-xr-xtool/sync_default_gems.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index 467063b968..4bd6bf6802 100755
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -435,7 +435,8 @@ module SyncDefaultGems
|\.git.*
|[A-Z]\w+file
|COPYING
- |rakelib\/.*
+ |\Arakelib\/.*
+ |\Atest\/lib\/.*
)\z/mx
def message_filter(repo, sha, input: ARGF)
@@ -583,8 +584,9 @@ module SyncDefaultGems
next
end
- tools = pipe_readlines(%W"git diff --name-only -z HEAD~..HEAD -- test/lib/ tool/")
+ tools = pipe_readlines(%W"git diff --name-only -z HEAD~..HEAD -- test/lib/ tool/ rakelib/")
unless tools.empty?
+ system(*%W"git rm --", *tools)
system(*%W"git checkout HEAD~ --", *tools)
if system(*%W"git diff --quiet HEAD~")
`git reset HEAD~ --` && `git checkout .` && `git clean -fd`