mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
sync_default_gems.rb: Ignore conflicted files in toplevel more
This commit is contained in:
parent
162d08b854
commit
6cd600ef69
1 changed files with 6 additions and 1 deletions
|
@ -311,7 +311,12 @@ def sync_default_gems(gem)
|
||||||
end
|
end
|
||||||
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)
|
def sync_default_gems_with_commits(gem, ranges, edit: nil)
|
||||||
puts "Sync #{$repositories[gem.to_sym]} with commit history."
|
puts "Sync #{$repositories[gem.to_sym]} with commit history."
|
||||||
|
|
Loading…
Reference in a new issue