diff options
| author | Mike McQuaid | 2014-11-03 10:00:50 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2014-11-03 10:00:50 +0000 |
| commit | 8dfe4ba77296fa2d4694df20f4e8a66395a01eb2 (patch) | |
| tree | acb270027df97fc83cb780964a34d295b5d2a810 /Library | |
| parent | 37afa2a64af5968acbc3ce72e136f15df9081ded (diff) | |
| download | homebrew-8dfe4ba77296fa2d4694df20f4e8a66395a01eb2.tar.bz2 | |
brew-pull: allow resolution with --resolve.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/pull.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/pull.rb b/Library/Homebrew/cmd/pull.rb index e1b3892f2..1031a2f23 100644 --- 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 - system 'git', 'am', '--abort' - odie 'Patch failed to apply: aborted.' + 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 |