aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cmd
diff options
context:
space:
mode:
authorJack Nagel2012-03-01 23:29:14 -0600
committerJack Nagel2012-03-01 23:29:14 -0600
commitcaa3c4f864ce96a84249c322bce0ccd6758e10be (patch)
treef7c53c223d4150175588200618ad6d47c733f30d /Library/Homebrew/cmd
parent2d5de8c7ed88e1ad23774a66a512851dc26d6864 (diff)
downloadbrew-caa3c4f864ce96a84249c322bce0ccd6758e10be.tar.bz2
doctor: make `git status` check saner
The order of things made the check for git in the path pointless (and was my fault); this is a better way to do it. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Homebrew/cmd')
-rw-r--r--Library/Homebrew/cmd/doctor.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index 4094be311..76763208f 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -732,9 +732,9 @@ def check_missing_deps
end
def check_git_status
+ return unless system "/usr/bin/which -s git"
HOMEBREW_REPOSITORY.cd do
- cmd = `git status -s Library/Homebrew/ 2> /dev/null`.chomp
- if system "/usr/bin/which -s git" and File.directory? '.git' and not cmd.empty? then <<-EOS.undent
+ unless `git status -s -- Library/Homebrew/ 2>/dev/null`.chomp.empty? then <<-EOS.undent
You have uncommitted modifications to Homebrew's core.
Unless you know what you are doing, you should run:
cd #{HOMEBREW_REPOSITORY} && git reset --hard