diff options
| author | Mike McQuaid | 2014-11-03 10:00:50 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2014-11-03 10:00:50 +0000 |
| commit | 2d67c5ee8f7bfe1ac68bde638af852c67816cb7f (patch) | |
| tree | 905ef3fca6efec4211dac10e332b6265b1780a90 /Library | |
| parent | 9b86218854464155d17c5cc344ebcf225c02a509 (diff) | |
| download | brew-2d67c5ee8f7bfe1ac68bde638af852c67816cb7f.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 |