ruby-changes:71752
From: Nobuyoshi <ko1@a...>
Date: Sat, 16 Apr 2022 16:47:06 +0900 (JST)
Subject: [ruby-changes:71752] b09e96341e (master): Simplify the condition expression to ignore commits
https://git.ruby-lang.org/ruby.git/commit/?id=b09e96341e From b09e96341e8157a190b4c4b0ec0784be76887e0d Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Sat, 16 Apr 2022 16:45:46 +0900 Subject: Simplify the condition expression to ignore commits --- tool/sync_default_gems.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 56279ead0e..a65aab49ba 100755 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -427,7 +427,7 @@ def sync_default_gems_with_commits(gem, ranges, edit: nil) https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L427 files = IO.popen(%W"git diff-tree -z --no-commit-id --name-only -r #{sha}") {|f| f.readlines("\0", chomp: true) } - subject =~ /^Merge/ || subject =~ /^Auto Merge/ || files.all?{|file| file =~ IGNORE_FILE_PATTERN} + subject.start_with?("Merge", "Auto Merge") or files.all?(IGNORE_FILE_PATTERN) end if commits.empty? -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/