From 01dc9c4900b42d8d3556c316dbcb4a8597d8b7f4 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 5 Jul 2014 17:30:41 -0500 Subject: [PATCH] brew-pull: rescue a specific exception --- Library/Contributions/cmd/brew-pull.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Contributions/cmd/brew-pull.rb b/Library/Contributions/cmd/brew-pull.rb index f75174c736..45e1f8e505 100755 --- a/Library/Contributions/cmd/brew-pull.rb +++ b/Library/Contributions/cmd/brew-pull.rb @@ -73,7 +73,7 @@ ARGV.named.each do |arg| begin safe_system 'git', 'am', *patch_args - rescue => e + rescue ErrorDuringExecution system 'git', 'am', '--abort' odie 'Patch failed to apply: aborted.' end