From caa3c4f864ce96a84249c322bce0ccd6758e10be Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Thu, 1 Mar 2012 23:29:14 -0600 Subject: [PATCH] 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 --- Library/Homebrew/cmd/doctor.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index 4094be3117..76763208f1 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