From 2c3b2f68cd2b22e08b8841cc4de3d67593284b9f Mon Sep 17 00:00:00 2001
From: Issy Long <me@issyl0.co.uk>
Date: Thu, 9 Jul 2020 08:18:38 +0100
Subject: [PATCH] Revert #7933 ("sorbet: set utils/git.rb to true")

- My refactoring of #7933 went wrong in that the tests passed for `brew
  extract` and my manual testing, but both forgot about third-party taps
  exist, so that functionality broke as follows (courtesy of Misty).

  Before:

  ```
  # Git.last_revision_commit_of_files("/usr/local/Homebrew", ["LICENSE.txt", "README.md"])
  => ["ac0665d", ["README.md"]]
  ```

  After:

  ```
  # Git.last_revision_commit_of_files("/usr/local/Homebrew", ["LICENSE.txt", "README.md"])
  => [nil, []]
  ```

- While we think about how to do splats in Sorbet, revert this so
  that users are able to `brew extract` from third party taps again.

- A TODO for later in a separate PR is to write a test for `brew
  extract` that tests the behaviour of third-party taps.

---

- Reverted this manually because the GitHub UI couldn't do it.
- Arguably I didn't need to remove the RBI file, but it's easier to have
  everything gone for now and then revert this revert in future once we
  have a strategy for dealing with splats in Sorbet than have
  inconsistency.
---
 Library/Homebrew/sorbet/files.yaml        |  2 +-
 Library/Homebrew/sorbet/rbi/utils/git.rbi | 15 ---------------
 Library/Homebrew/utils/git.rb             |  2 +-
 3 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 Library/Homebrew/sorbet/rbi/utils/git.rbi

diff --git a/Library/Homebrew/sorbet/files.yaml b/Library/Homebrew/sorbet/files.yaml
index b215c0e006..fce491d0ed 100644
--- a/Library/Homebrew/sorbet/files.yaml
+++ b/Library/Homebrew/sorbet/files.yaml
@@ -453,6 +453,7 @@ false:
   - ./utils/curl.rb
   - ./utils/fork.rb
   - ./utils/formatter.rb
+  - ./utils/git.rb
   - ./utils/github.rb
   - ./utils/popen.rb
   - ./utils/user.rb
@@ -891,7 +892,6 @@ true:
   - ./test/support/lib/config.rb
   - ./utils/bottles.rb
   - ./utils/notability.rb
-  - ./utils/git.rb
   - ./utils/shell.rb
   - ./utils/svn.rb
   - ./utils/tty.rb
diff --git a/Library/Homebrew/sorbet/rbi/utils/git.rbi b/Library/Homebrew/sorbet/rbi/utils/git.rbi
deleted file mode 100644
index c75df23a10..0000000000
--- a/Library/Homebrew/sorbet/rbi/utils/git.rbi
+++ /dev/null
@@ -1,15 +0,0 @@
-# typed: strict
-
-module Git
-  include Kernel
-
-  def last_revision_commit_of_file(repo, file, before_commit: nil)
-  end
-
-  sig { params(repo: Pathname, files: T::Array[Pathname], before_commit: T.nilable(String)).void }
-  def last_revision_commit_of_files(repo, files, before_commit: nil)
-  end
-
-  def last_revision_of_file(repo, file, before_commit: nil)
-  end
-end
diff --git a/Library/Homebrew/utils/git.rb b/Library/Homebrew/utils/git.rb
index 336ff5a4dd..fadc35de36 100644
--- a/Library/Homebrew/utils/git.rb
+++ b/Library/Homebrew/utils/git.rb
@@ -36,7 +36,7 @@ module Git
     out, = Open3.capture3(
       HOMEBREW_SHIMS_PATH/"scm/git", "-C", repo, "log",
       "--pretty=format:%h", "--abbrev=7", "--max-count=1",
-      "--diff-filter=d", "--name-only", *args, "--", files.join(" ")
+      "--diff-filter=d", "--name-only", *args, "--", *files
     )
     rev, *paths = out.chomp.split(/\n/).reject(&:empty?)
     [rev, paths]