diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-10-25 13:50:31 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-10-25 13:52:53 +0900 |
| commit | d76284dfb764ac8259b823b5bfc3e886e41a100e (patch) | |
| tree | f1a95889855eb10b02e35e1239a66c309d451a16 /tool/sync_default_gems.rb | |
| parent | 902e459b733a92c3ccdd8762427f71dded997e7c (diff) | |
sync_default_gems.rb: Ignore unmergeable files [ci skip]
Diffstat (limited to 'tool/sync_default_gems.rb')
| -rwxr-xr-x | tool/sync_default_gems.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 5aa7eb06eb..8d33004ffb 100755 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -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? |