mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Do not import any files under rakelib
This commit is contained in:
parent
723debc9a9
commit
492185e39c
1 changed files with 5 additions and 3 deletions
|
@ -375,8 +375,8 @@ IGNORE_FILE_PATTERN =
|
||||||
|\.git.*
|
|\.git.*
|
||||||
|[A-Z]\w+file
|
|[A-Z]\w+file
|
||||||
|COPYING
|
|COPYING
|
||||||
|rakelib\/
|
|rakelib\/.*
|
||||||
)\z/x
|
)\z/mx
|
||||||
|
|
||||||
def message_filter(repo, sha)
|
def message_filter(repo, sha)
|
||||||
log = STDIN.read
|
log = STDIN.read
|
||||||
|
@ -424,7 +424,9 @@ def sync_default_gems_with_commits(gem, ranges, edit: nil)
|
||||||
|
|
||||||
# Ignore Merge commit and insufficiency commit for ruby core repository.
|
# Ignore Merge commit and insufficiency commit for ruby core repository.
|
||||||
commits.delete_if do |sha, subject|
|
commits.delete_if do |sha, subject|
|
||||||
files = IO.popen(%W"git diff-tree --no-commit-id --name-only -r #{sha}", &:readlines)
|
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 =~ /^Merge/ || subject =~ /^Auto Merge/ || files.all?{|file| file =~ IGNORE_FILE_PATTERN}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue