pull: fallback to old BrewTestBot git repo when necessary

1 files changed, 10 insertions, 1 deletions

diff --git a/Library/Homebrew/cmd/pull.rb b/Library/Homebrew/cmd/pull.rb
index 86018b47a..e73ead192 100644
--- a/Library/Homebrew/cmd/pull.rb
+++ b/Library/Homebrew/cmd/pull.rb
@@ -193,7 +193,16 @@ module Homebrew
           bottle_branch = "pull-bottle-#{issue}"
           "https://github.com/BrewTestBot/homebrew-#{tap.repo}/compare/homebrew:master...pr-#{issue}"
         end
-        curl "--silent", "--fail", "-o", "/dev/null", "-I", bottle_commit_url
+
+        bottle_commit_fallbacked = false
+        begin
+          curl "--silent", "--fail", "-o", "/dev/null", "-I", bottle_commit_url
+        rescue ErrorDuringExecution
+          raise if !ARGV.include?("--legacy") || bottle_commit_fallbacked
+          bottle_commit_url = "https://github.com/BrewTestBot/homebrew/compare/homebrew:master...pr-#{issue}"
+          bottle_commit_fallbacked = true
+          retry
+        end
 
         safe_system "git", "checkout", "-B", bottle_branch, revision
         pull_patch bottle_commit_url