diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-04-16 16:26:46 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-04-16 16:45:11 +0900 |
| commit | 492185e39c0edec8461502fc30f607ea2f035a5e (patch) | |
| tree | cc94df8c0380196947bd67cc4baed5f9d03946e2 | |
| parent | 723debc9a99a577e2da2f209c094852718a58ffa (diff) | |
Do not import any files under rakelib
| -rwxr-xr-x | tool/sync_default_gems.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 564877a26b..56279ead0e 100755 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -375,8 +375,8 @@ IGNORE_FILE_PATTERN = |\.git.* |[A-Z]\w+file |COPYING - |rakelib\/ - )\z/x + |rakelib\/.* + )\z/mx def message_filter(repo, sha) log = STDIN.read @@ -424,7 +424,9 @@ def sync_default_gems_with_commits(gem, ranges, edit: nil) # Ignore Merge commit and insufficiency commit for ruby core repository. commits.delete_if do |sha, subject| - files = IO.popen(%W"git diff-tree --no-commit-id --name-only -r #{sha}", &:readlines) + files = IO.popen(%W"git diff-tree -z --no-commit-id --name-only -r #{sha}") {|f| + f.readlines("\0", chomp: true) + } subject =~ /^Merge/ || subject =~ /^Auto Merge/ || files.all?{|file| file =~ IGNORE_FILE_PATTERN} end |