diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-07-12 23:59:18 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-07-13 00:14:07 +0900 |
| commit | 6cd600ef697ef046651028538ab59233c335e5c6 (patch) | |
| tree | 76e6ccd676606e38ce8af185f1d53d3ee0c1d1cb /tool | |
| parent | 162d08b8541167a089b2c504d3437b577c38c3f9 (diff) | |
sync_default_gems.rb: Ignore conflicted files in toplevel more
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/sync_default_gems.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 4cd8ddb5d6..5c70b3c24e 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -311,7 +311,12 @@ def sync_default_gems(gem) end end -IGNORE_FILE_PATTERN = /\A(?:\.travis.yml|appveyor\.yml|azure-pipelines\.yml|\.git(?:ignore|hub)|Gemfile|README\.md|History\.txt|Rakefile|CODE_OF_CONDUCT\.md)/ +IGNORE_FILE_PATTERN = + /\A(?:[A-Z]\w*\.(?:md|txt) + |[^\/]+\.yml + |\.git.* + |[A-Z]\w+file + )\z/x def sync_default_gems_with_commits(gem, ranges, edit: nil) puts "Sync #{$repositories[gem.to_sym]} with commit history." |