admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #6914 from MikeMcQuaid/doctor_desired_origin_url

Browse Source 
diagnostic: fix suggested origin URL.
This commit is contained in:
Mike McQuaid 2020-01-09 15:40:27 +00:00 committed by GitHub
commit f1de689385
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/diagnostic.rb
View File

@ -120,7 +120,7 @@ module Homebrew
Without a correctly configured origin, Homebrew won't update Without a correctly configured origin, Homebrew won't update
properly. You can solve this by adding the remote: properly. You can solve this by adding the remote:
git -C "#{repository_path}" remote add origin #{Formatter.url("https://github.com/#{desired_origin}.git")} git -C "#{repository_path}" remote add origin #{Formatter.url(desired_origin)}
EOS EOS
elsif !current_origin.match?(%r{#{desired_origin}(\.git|/)?$}i) elsif !current_origin.match?(%r{#{desired_origin}(\.git|/)?$}i)
<<~EOS <<~EOS
@ -130,7 +130,7 @@ module Homebrew
With a non-standard origin, Homebrew won't update properly. With a non-standard origin, Homebrew won't update properly.
You can solve this by setting the origin remote: You can solve this by setting the origin remote:
git -C "#{repository_path}" remote set-url origin #{Formatter.url("https://github.com/#{desired_origin}")} git -C "#{repository_path}" remote set-url origin #{Formatter.url(desired_origin)}
EOS EOS
end end
end end
@ -568,8 +568,10 @@ module Homebrew
end end
def check_casktap_git_origin def check_casktap_git_origin
cask = Tap.default_cask_tap cask_tap = Tap.default_cask_tap
examine_git_origin(cask.path, cask.full_name) if cask.installed? return unless cask_tap.installed?
examine_git_origin(cask_tap.path, cask_tap.remote)
end end
def check_coretap_git_branch def check_coretap_git_branch