kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

sync_default_gems.rb: Ignore unmergeable files [ci skip]

Browse source
This commit is contained in:
Nobuyoshi Nakada 2022-10-25 13:50:31 +09:00
parent 902e459b73
commit d76284dfb7
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tool/sync_default_gems.rb
View file

@ -520,7 +520,7 @@ def sync_default_gems_with_commits(gem, ranges, edit: nil)
skipped = true
elsif /^CONFLICT/ =~ result
result = pipe_readlines(%W"git status --porcelain -z")
result.map! {|line| line[/\A.U (.*)/, 1]}
result.map! {|line| line[/\A(?:.U|AA) (.*)/, 1]}
result.compact!
ignore, conflict = result.partition {|name| IGNORE_FILE_PATTERN =~ name}
unless ignore.empty?