brew-pull: allow resolution with --resolve.

2014-11-03 10:00:50 +00:00 · 2014-11-03 10:00:50 +00:00 · 2d67c5ee8f
commit 2d67c5ee8f
parent 9b86218854
1 changed files with 6 additions and 2 deletions
--- a/Library/Homebrew/cmd/pull.rb
+++ b/Library/Homebrew/cmd/pull.rb
@ -34,8 +34,12 @@ module Homebrew
    begin
      safe_system 'git', 'am', *patch_args
    rescue ErrorDuringExecution
+      if ARGV.include? "--resolve"
+        odie "Patch failed to apply: try to resolve it."
+      else
        system 'git', 'am', '--abort'
        odie 'Patch failed to apply: aborted.'
+      end
    ensure
      patchpath.unlink
    end