Merge pull request #15737 from EricFromCanada/tap-remote-repair

cmd/tap: ensure remote exists before repairing
This commit is contained in:
Eric Knibbe 2023-07-23 14:27:41 -04:00 committed by GitHub
commit 0e8d1e0bec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -419,6 +419,7 @@ class Tap
end end
$stderr.ohai "#{name}: changed remote from #{remote} to #{requested_remote}" unless quiet $stderr.ohai "#{name}: changed remote from #{remote} to #{requested_remote}" unless quiet
end end
return unless remote
current_upstream_head = T.must(git_repo.origin_branch_name) current_upstream_head = T.must(git_repo.origin_branch_name)
return if requested_remote.blank? && git_repo.origin_has_branch?(current_upstream_head) return if requested_remote.blank? && git_repo.origin_has_branch?(current_upstream_head)