aboutsummaryrefslogtreecommitdiffstats
path: root/tool
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2023-08-31 11:32:29 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2023-08-31 11:32:29 +0900
commit2ce1b77ce0e776281142ab23523b745c9416105e (patch)
treeb0ef4732e3824605fb08e0905bd4beca371794b6 /tool
parentcbe36ef6ccb9cb19d97612a85eede68cb3c073cb (diff)
downloadruby-2ce1b77ce0e776281142ab23523b745c9416105e.tar.gz
sync_default_gems.rb: Discard some error messages
These messages are expected: - `cat-file -e` at newly added entries. - `commit --amend` when all changes removed.
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 a51e324831..2879ff6081 100755
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -566,7 +566,7 @@ module SyncDefaultGems
case
when toplevels.fetch(top = f[%r[\A[^/]+(?=/|\z)]m]) {
remove << top unless
- toplevels[top] = system(*%w"git cat-file -e", "#{base}:#{top}")
+ toplevels[top] = system(*%w"git cat-file -e", "#{base}:#{top}", err: File::NULL)
}
# Remove any new top-level directories.
true
@@ -595,7 +595,9 @@ module SyncDefaultGems
unless remove.empty?
puts "Remove added files: #{remove.join(', ')}"
system(*%w"git rm -fr --", *remove)
- system(*%w"git commit --amend --no-edit --", *remove) if picked
+ if picked
+ system(*%w"git commit --amend --no-edit --", *remove, %i[out err] => File::NULL)
+ end
end
unless ignore.empty?