From c4fc9477aa5f77a69a40b619b7144f2b118b772e Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 29 Aug 2023 10:20:41 +0900 Subject: [PATCH] sync_default_gems.rb: Continue if files added to the toplevel removed --- tool/sync_default_gems.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 0bbaa23410..1959b334aa 100755 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -628,7 +628,9 @@ module SyncDefaultGems `git reset HEAD~ --` && `git checkout .` && `git clean -fd` puts "Skip commit #{sha} only for tools or toplevel" return false - elsif !system(*%W"git commit --amend --no-edit --", *toplevels, *tools) + elsif system(*%W"git commit --amend --no-edit --", *toplevels, *tools) + return true + else `git reset HEAD~ --` && `git checkout .` && `git clean -fd` return nil end