aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2011-12-28 19:32:40 -0600
committerJack Nagel2011-12-28 19:55:02 -0600
commit66dcfcd8cc98eb4abc9b4d67624a642e2afe54a5 (patch)
tree453c9a76adb7c2e202289ccb6d87973739e14822
parent647e7f11267ca101500081c1203bf31af7ed7f97 (diff)
downloadbrew-66dcfcd8cc98eb4abc9b4d67624a642e2afe54a5.tar.bz2
doctor: clean up check_git_status
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
-rw-r--r--Library/Homebrew/cmd/doctor.rb13
1 files changed, 7 insertions, 6 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index eb9ec885f..bc32883fe 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -751,12 +751,13 @@ def check_missing_deps
end
def check_git_status
- 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
+ HOMEBREW_REPOSITORY.cd do
+ cmd = `git status -s Library/Homebrew/`.chomp
+ if system "/usr/bin/which -s git" and File.directory? '.git' and not 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
+ end
end
end