summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2022-04-16 16:45:46 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2022-04-16 16:45:46 +0900
commitb09e96341e8157a190b4c4b0ec0784be76887e0d (patch)
tree1a8db0dd0bde1693e565dadb5e374beadb44b8d8
parent492185e39c0edec8461502fc30f607ea2f035a5e (diff)
Simplify the condition expression to ignore commits
-rwxr-xr-xtool/sync_default_gems.rb2
1 files changed, 1 insertions, 1 deletions
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)
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?