admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

brew-pull: run git am --abort on failure.

Browse Source
This commit is contained in:
Mike McQuaid 2013-11-16 20:39:12 +00:00
parent 674d041d80
commit ed7693cecf
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Contributions/cmd/brew-pull.rb
View File

@ -48,7 +48,7 @@ ARGV.named.each do|arg|
revision = `git rev-parse --short HEAD`.strip revision = `git rev-parse --short HEAD`.strip
ohai 'Applying patch' ohai 'Applying patch'
patch_args = ['am'] patch_args = []
patch_args << '--signoff' unless ARGV.include? '--clean' patch_args << '--signoff' unless ARGV.include? '--clean'
# Normally we don't want whitespace errors, but squashing them can break # Normally we don't want whitespace errors, but squashing them can break
# patches so an option is provided to skip this step. # patches so an option is provided to skip this step.
@ -59,7 +59,12 @@ ARGV.named.each do|arg|
end end
patch_args << patchpath patch_args << patchpath
safe_system 'git', *patch_args begin
safe_system 'git', 'am', *patch_args
rescue => e
system 'git', 'am', '--abort'
odie 'Patch failed to apply: aborted.'
end
issue = arg.to_i > 0 ? arg.to_i : url_match[4] issue = arg.to_i > 0 ? arg.to_i : url_match[4]
if issue and not ARGV.include? '--clean' if issue and not ARGV.include? '--clean'