1
0
Fork 0
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:
Hiroshi SHIBATA 2019-08-07 22:29:02 +09:00
parent 82527d9b50
commit 67cde179c5
No known key found for this signature in database
GPG key ID: F9CF13417264FAC2

View file

@ -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:"