diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2023-08-29 10:20:41 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2023-08-29 10:20:52 +0900 |
| commit | c4fc9477aa5f77a69a40b619b7144f2b118b772e (patch) | |
| tree | 02053a8dd24635982a7830c7d3b6a224ff4f093f /tool | |
| parent | a6db6b150f2f37e05ea32fe6c13e4cf7a2f7838a (diff) | |
sync_default_gems.rb: Continue if files added to the toplevel removed
Diffstat (limited to 'tool')
| -rwxr-xr-x | tool/sync_default_gems.rb | 4 |
1 files changed, 3 insertions, 1 deletions
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 |