diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2023-09-16 11:56:50 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2023-09-16 12:00:06 +0900 |
| commit | 67dedf8cf634843488a477e53b9995b63e9aa291 (patch) | |
| tree | bb938dfbfd8d1d40f00e1a69beb7e3ae22c7012f | |
| parent | 9aeb6e72db7a049a620a6d10836992dc9d0cf3b3 (diff) | |
Ignore changed files under removed paths
This fixes the issue commit 43ab2acf8242c580b1ef5d644ea94d48669d4869
"Resurrect gem-specific patterns for sync" described.
| -rwxr-xr-x | tool/sync_default_gems.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 9e088e5382..a931f86227 100755 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -447,15 +447,7 @@ module SyncDefaultGems # Gem-specific patterns case gem - when "yarp" - %r[\A(?: - Makefile\.in - |configure\.ac - |fuzz/.* - |rust/.* - |tasks/.* - |ext/yarp/extconf\.rb - )\z]mx + when nil end&.tap do |pattern| patterns << pattern end @@ -606,6 +598,8 @@ module SyncDefaultGems if picked system(*%w"git commit --amend --no-edit --", *remove, %i[out err] => File::NULL) end + remove = remove.map {|d| d + "/"} + changed.delete_if {|f| remove.any? {|d| f.start_with?(d)}} end unless ignore.empty? |
