diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-08-07 22:29:02 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-08-07 22:29:02 +0900 |
| commit | 67cde179c5b23f1e8da3cb7554d26c79ed1c3b97 (patch) | |
| tree | 65b0aabf5e970b8583059551409931b76d9b5e67 | |
| parent | 82527d9b50207607b2adb7fb6dded91d23749feb (diff) | |
Skip merge commit created by bundlerbot.
| -rw-r--r-- | 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 33703d0492..379dee4a16 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -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:" |