From 71198041c66e7544d31f80f3724691fa88179671 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 14 Sep 2015 09:06:16 +0100
Subject: [PATCH] test-bot: fix handling hash/url arguments.

---
 Library/Homebrew/cmd/test-bot.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb
index ebee97261d..84008ef216 100644
--- a/Library/Homebrew/cmd/test-bot.rb
+++ b/Library/Homebrew/cmd/test-bot.rb
@@ -188,17 +188,12 @@ module Homebrew
 
       url_match = argument.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX
 
-      begin
-        formula = Formulary.factory(argument)
-      rescue FormulaUnavailableError, TapFormulaAmbiguityError
-      end
-
       git "rev-parse", "--verify", "-q", argument
       if $?.success?
         @hash = argument
       elsif url_match
         @url = url_match[0]
-      elsif formula
+      elsif safe_formulary(argument)
         @formulae = [argument]
       else
         raise ArgumentError.new("#{argument} is not a pull request URL, commit URL or formula name.")
@@ -213,6 +208,11 @@ module Homebrew
       @hash == "HEAD"
     end
 
+    def safe_formulary(formula)
+      Formulary.factory formula
+    rescue FormulaUnavailableError, TapFormulaAmbiguityError
+    end
+
     def git(*args)
       rd, wr = IO.pipe