diff --git a/Library/Homebrew/dev-cmd/pr-pull.rb b/Library/Homebrew/dev-cmd/pr-pull.rb index 80a75e5703..258c2e8c26 100644 --- a/Library/Homebrew/dev-cmd/pr-pull.rb +++ b/Library/Homebrew/dev-cmd/pr-pull.rb @@ -161,10 +161,10 @@ module Homebrew package_name = package_file.basename.to_s.chomp(".rb") odebug "Cherry-picking #{package_file}: #{commit}" - Utils::Git.cherry_pick!(git_repo, commit, verbose: verbose, resolve: resolve) + Utils::Git.cherry_pick!(git_repo.to_s, commit, verbose: verbose, resolve: resolve) - old_package = Utils::Git.file_at_commit(git_repo, file, "HEAD^") - new_package = Utils::Git.file_at_commit(git_repo, file, "HEAD") + old_package = Utils::Git.file_at_commit(git_repo.to_s, file, "HEAD^") + new_package = Utils::Git.file_at_commit(git_repo.to_s, file, "HEAD") bump_subject = determine_bump_subject(old_package, new_package, package_file, reason: reason).strip subject, body, trailers = separate_commit_message(git_repo.commit_message) diff --git a/Library/Homebrew/git_repository.rb b/Library/Homebrew/git_repository.rb index ba5aab4024..83a312c425 100644 --- a/Library/Homebrew/git_repository.rb +++ b/Library/Homebrew/git_repository.rb @@ -109,6 +109,11 @@ class GitRepository popen_git("log", "-1", "--pretty=%B", commit, "--", safe: safe, err: :out)&.strip end + sig { returns(String) } + def to_s + pathname.to_s + end + private sig { params(args: T.untyped, safe: T::Boolean, err: T.nilable(Symbol)).returns(T.nilable(String)) }