mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Skip merge commit created by bundlerbot.
This commit is contained in:
parent
82527d9b50
commit
67cde179c5
1 changed files with 1 additions and 1 deletions
|
@ -252,7 +252,7 @@ def sync_default_gems_with_commits(gem, range)
|
|||
IO.popen(%W"git diff-tree --no-commit-id --name-only -r #{sha}") do |f|
|
||||
files = f.read.split("\n")
|
||||
end
|
||||
subject =~ /^Merge/ || files.all?{|file| file =~ IGNORE_FILE_PATTERN}
|
||||
subject =~ /^Merge/ || subject =~ /^Auto Merge/ || files.all?{|file| file =~ IGNORE_FILE_PATTERN}
|
||||
end
|
||||
|
||||
puts "Try to pick these commits:"
|
||||
|
|
Loading…
Reference in a new issue