aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorilovezfs2017-08-26 10:18:11 -0700
committerGitHub2017-08-26 10:18:11 -0700
commit551e5dd94578062e0ab42bc56e0fdd106807839b (patch)
treec282b20c364f05bb2435935a02241e0fe6e95bee /Library
parent784a85f885cf94082eb22c4c913699ba52cfe08b (diff)
parent78a742c1ff8777432b28a913f6048b38e5d44b62 (diff)
downloadbrew-551e5dd94578062e0ab42bc56e0fdd106807839b.tar.bz2
Merge pull request #3093 from Homebrew/revert-3089-check-for-branch
Revert "Add check for HEAD ref in diagnostics"
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/diagnostic.rb12
1 files changed, 1 insertions, 11 deletions
diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb
index 8108c5da0..ceb6ad4d1 100644
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@@ -756,7 +756,7 @@ module Homebrew
end
end
- def check_coretap_git_config
+ def check_coretap_git_origin
coretap_path = CoreTap.instance.path
return if !Utils.git_available? || !(coretap_path/".git").exist?
@@ -785,16 +785,6 @@ module Homebrew
git -C "#{coretap_path}" remote set-url origin #{Formatter.url("https://github.com/Homebrew/homebrew-core.git")}
EOS
end
-
- head = coretap_path.git_head
- return if head.nil? || head =~ %r{refs/heads/master}
-
- <<-EOS.undent
- Homebrew/homebrew-core is not on the master branch
-
- Check out the master branch by running:
- git -C "$(brew --repo homebrew/core)" checkout master
- EOS
end
def __check_linked_brew(f)