From cf204b6234e09b59024b6f6a3e4ba5161c3e8ea5 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 20 Mar 2015 17:45:48 +0000 Subject: [PATCH] pull: die on invalid parameters. --- Library/Homebrew/cmd/pull.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/cmd/pull.rb b/Library/Homebrew/cmd/pull.rb index 654ef1fe61..074ced1eee 100644 --- a/Library/Homebrew/cmd/pull.rb +++ b/Library/Homebrew/cmd/pull.rb @@ -50,11 +50,11 @@ module Homebrew def pull if ARGV.empty? - onoe 'This command requires at least one argument containing a URL or pull request number' + odie 'This command requires at least one argument containing a URL or pull request number' end if ARGV[0] == '--rebase' - onoe 'You meant `git pull --rebase`.' + odie 'You meant `git pull --rebase`.' end ARGV.named.each do |arg| @@ -68,10 +68,7 @@ module Homebrew end url_match = arg.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX - unless url_match - ohai 'Ignoring URL:', "Not a GitHub pull request or commit: #{arg}" - next - end + odie "Not a GitHub pull request or commit: #{arg}" unless url_match url = url_match[0] issue = url_match[3]