kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[sync_default_gems.rb] Reset files to be ignored

Browse source 
[ci skip]
This commit is contained in:
Nobuyoshi Nakada 2020-04-01 18:40:27 +09:00
parent 668c97b72c
commit 691a15ebc7
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tool/sync_default_gems.rb
View file

@ -348,9 +348,7 @@ def sync_default_gems_with_commits(gem, range)
# Ignore Merge commit and insufficiency commit for ruby core repository.
commits.delete_if do |sha, subject|
files = IO.popen(%W"git diff-tree --no-commit-id --name-only -r #{sha}") do |f|
f.readlines
end
files = IO.popen(%W"git diff-tree --no-commit-id --name-only -r #{sha}", &:readlines)
subject =~ /^Merge/ || subject =~ /^Auto Merge/ || files.all?{|file| file =~ IGNORE_FILE_PATTERN}
end
@ -375,12 +373,21 @@ def sync_default_gems_with_commits(gem, range)
next if skipped
if result.empty?
skipped = true
elsif result.start_with?("CONFLICT")
result = IO.popen(%W"git status --porcelain", &:readlines).each(&:chomp!)
ignore = result.map {|line| /^DU / =~ line and IGNORE_FILE_PATTERN =~ (name = $') and name}
ignore.compact!
system(*%W"git reset", *ignore) unless ignore.empty?
skipped = !system({"GIT_EDITOR"=>"true"}, *%W"git cherry-pick --no-edit --continue")
end
if skipped
failed_commits << sha
`git reset` && `git checkout .` && `git clean -fd`
skipped = true
puts "Failed to pick #{sha}"
next
end
next if skipped
puts "Update commit message: #{sha}"