1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[sync_default_gems.rb] Force reset conflict files to be ignored

Browse Source 
[ci skip]
This commit is contained in:
Nobuyoshi Nakada 2020-04-20 21:23:26 +09:00
parent aeb9d11594
commit 3cd3a507e3
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tool/sync_default_gems.rb
View File

@ -374,11 +374,14 @@ def sync_default_gems_with_commits(gem, range)
if result.empty?
skipped = true
elsif result.start_with?("CONFLICT")
elsif /^CONFLICT/ =~ result
result = IO.popen(%W"git status --porcelain", &:readlines).each(&:chomp!)
ignore = result.map {|line| /^DU / =~ line and IGNORE_FILE_PATTERN =~ (name = $') and name}
ignore = result.map {|line| /^.U / =~ line and IGNORE_FILE_PATTERN =~ (name = $') and name}
ignore.compact!
system(*%W"git reset", *ignore) unless ignore.empty?
unless ignore.empty?
system(*%W"git reset HEAD --", *ignore)
system(*%W"git checkout HEAD --", *ignore)
end
skipped = !system({"GIT_EDITOR"=>"true"}, *%W"git cherry-pick --no-edit --continue")
end