6 files changed, 15 insertions, 8 deletions
diff --git a/Library/Homebrew/utils/analytics.rb b/Library/Homebrew/utils/analytics.rb
index a89995ba9..9766c14db 100644
--- a/Library/Homebrew/utils/analytics.rb
+++ b/Library/Homebrew/utils/analytics.rb
@@ -3,6 +3,11 @@ require "erb"
 module Utils
   module Analytics
     class << self
+      def clear_anonymous_os_prefix_ci_cache
+        return unless instance_variable_defined?(:@anonymous_os_prefix_ci)
+        remove_instance_variable(:@anonymous_os_prefix_ci)
+      end
+
       def os_prefix_ci
         @anonymous_os_prefix_ci ||= begin
           os = OS_VERSION
diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb
index 52d03c93e..bc7055c0c 100644
--- a/Library/Homebrew/utils/curl.rb
+++ b/Library/Homebrew/utils/curl.rb
@@ -37,13 +37,12 @@ def curl(*args)
   safe_system(*curl_args(*args))
 end
 
-def curl_download(*args, to: nil, **options)
-  continue_at ||= "-"
-  curl("--location", "--remote-time", "--continue-at", continue_at, "--output", to, *args, **options)
+def curl_download(*args, to: nil, continue_at: "-", **options)
+  curl("--location", "--remote-time", "--continue-at", continue_at.to_s, "--output", to, *args, **options)
 rescue ErrorDuringExecution
   # `curl` error 33: HTTP server doesn't seem to support byte ranges. Cannot resume.
   if $CHILD_STATUS.exitstatus == 33 && continue_at == "-"
-    continue_at = "0"
+    continue_at = 0
     retry
   end
 
diff --git a/Library/Homebrew/utils/fork.rb b/Library/Homebrew/utils/fork.rb
index 92f5bf899..2f2a403e2 100644
--- a/Library/Homebrew/utils/fork.rb
+++ b/Library/Homebrew/utils/fork.rb
@@ -38,7 +38,7 @@ module Utils
           Process.wait(pid) unless socket.nil?
           raise Marshal.load(data) unless data.nil? || data.empty?
           raise Interrupt if $CHILD_STATUS.exitstatus == 130
-          raise "Suspicious failure" unless $CHILD_STATUS.success?
+          raise "Forked child process failed: #{$CHILD_STATUS}" unless $CHILD_STATUS.success?
         end
       end
     end
diff --git a/Library/Homebrew/utils/git.rb b/Library/Homebrew/utils/git.rb
index 43d93b64e..1fc01188c 100644
--- a/Library/Homebrew/utils/git.rb
+++ b/Library/Homebrew/utils/git.rb
@@ -16,8 +16,7 @@ module Git
   def last_revision_of_file(repo, file, before_commit: nil)
     relative_file = Pathname(file).relative_path_from(repo)
 
-    commit_hash = last_revision_commit_of_file(repo, file, before_commit: before_commit)
-
+    commit_hash = last_revision_commit_of_file(repo, relative_file, before_commit: before_commit)
     out, = Open3.capture3(
       HOMEBREW_SHIMS_PATH/"scm/git", "-C", repo,
       "show", "#{commit_hash}:#{relative_file}"
diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb
index a1cf5fbba..a50d6d8e5 100644
--- a/Library/Homebrew/utils/github.rb
+++ b/Library/Homebrew/utils/github.rb
@@ -245,7 +245,7 @@ module GitHub
   end
 
   def print_pull_requests_matching(query)
-    open_or_closed_prs = search_issues(query, type: "pr")
+    open_or_closed_prs = search_issues(query, type: "pr", user: "Homebrew")
 
     open_prs = open_or_closed_prs.select { |i| i["state"] == "open" }
     prs = if !open_prs.empty?
diff --git a/Library/Homebrew/utils/svn.rb b/Library/Homebrew/utils/svn.rb
index fb49ac2e9..150b7eee7 100644
--- a/Library/Homebrew/utils/svn.rb
+++ b/Library/Homebrew/utils/svn.rb
@@ -1,4 +1,8 @@
 module Utils
+  def self.clear_svn_version_cache
+    remove_instance_variable(:@svn) if instance_variable_defined?(:@svn)
+  end
+
   def self.svn_available?
     return @svn if instance_variable_defined?(:@svn)
     @svn = quiet_system HOMEBREW_SHIMS_PATH/"scm/svn", "--version"