admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

pull: die on invalid parameters.

Browse Source
This commit is contained in:
Mike McQuaid 2015-03-20 17:45:48 +00:00
parent 3f9d5aad74
commit cf204b6234
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/cmd/pull.rb
View File

@ -50,11 +50,11 @@ module Homebrew
def pull def pull
if ARGV.empty? 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 end
if ARGV[0] == '--rebase' if ARGV[0] == '--rebase'
onoe 'You meant `git pull --rebase`.' odie 'You meant `git pull --rebase`.'
end end
ARGV.named.each do |arg| ARGV.named.each do |arg|
@ -68,10 +68,7 @@ module Homebrew
end end
url_match = arg.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX url_match = arg.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX
unless url_match odie "Not a GitHub pull request or commit: #{arg}" unless url_match
ohai 'Ignoring URL:', "Not a GitHub pull request or commit: #{arg}"
next
end
url = url_match[0] url = url_match[0]
issue = url_match[3] issue = url_match[3]