Merge pull request #7951 from issyl0/revert-7933

Revert #7933 ("sorbet: set utils/git.rb to true")
This commit is contained in:
Mike McQuaid 2020-07-09 09:09:41 +01:00 committed by GitHub
commit 146eca4608
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 17 deletions

View File

@ -453,6 +453,7 @@ false:
- ./utils/curl.rb - ./utils/curl.rb
- ./utils/fork.rb - ./utils/fork.rb
- ./utils/formatter.rb - ./utils/formatter.rb
- ./utils/git.rb
- ./utils/github.rb - ./utils/github.rb
- ./utils/popen.rb - ./utils/popen.rb
- ./utils/user.rb - ./utils/user.rb
@ -891,7 +892,6 @@ true:
- ./test/support/lib/config.rb - ./test/support/lib/config.rb
- ./utils/bottles.rb - ./utils/bottles.rb
- ./utils/notability.rb - ./utils/notability.rb
- ./utils/git.rb
- ./utils/shell.rb - ./utils/shell.rb
- ./utils/svn.rb - ./utils/svn.rb
- ./utils/tty.rb - ./utils/tty.rb

View File

@ -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

View File

@ -36,7 +36,7 @@ module Git
out, = Open3.capture3( out, = Open3.capture3(
HOMEBREW_SHIMS_PATH/"scm/git", "-C", repo, "log", HOMEBREW_SHIMS_PATH/"scm/git", "-C", repo, "log",
"--pretty=format:%h", "--abbrev=7", "--max-count=1", "--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 = out.chomp.split(/\n/).reject(&:empty?)
[rev, paths] [rev, paths]