From 6b9fa0b818117bbc5221bd38594bbb10d507a1f8 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Thu, 10 Nov 2011 22:53:10 -0600 Subject: [PATCH] doctor: check_git_status in correct location This would silently fail if HOMEBREW_REPOSITORY != HOMEBREW_PREFIX, which is obviously a valid Homebrew setup. Signed-off-by: Jack Nagel --- Library/Homebrew/cmd/doctor.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index 01632d66b1..0de6508cac 100644 --- a/Library/Homebrew/cmd/doctor.rb +++ b/Library/Homebrew/cmd/doctor.rb @@ -750,8 +750,9 @@ def check_missing_deps end def check_git_status - status_cmd = "git --git-dir=#{HOMEBREW_REPOSITORY}/.git --work-tree=#{HOMEBREW_PREFIX} status -s #{HOMEBREW_PREFIX}/Library/Homebrew" - if system "/usr/bin/which -s git" and File.directory? HOMEBREW_REPOSITORY+'.git' and not `#{status_cmd}`.empty? + repo = HOMEBREW_REPOSITORY + status_cmd = "git --git-dir=#{repo}/.git --work-tree=#{repo} status -s #{repo}/Library/Homebrew" + if system "/usr/bin/which -s git" and File.directory? repo+'.git' and not `#{status_cmd}`.empty? ohai "You have uncommitted modifications to Homebrew's core." puts "Unless you know what you are doing, you should: git reset --hard" puts