From 98bb638f29786cea209ee78f5caa7dda354e6ea5 Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Mon, 24 Aug 2015 20:10:53 -0700 Subject: Formula#file_modified?: fix for Xcodes without git Fixes Homebrew/homebrew#43206. --- Library/Homebrew/formula.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Library') diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 8fba7803b..c9e931311 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -765,10 +765,15 @@ class Formula end def file_modified? - git_dir = MacOS.locate("git").dirname.to_s + # New Homebrew installs may not be a git repo yet + return false unless File.exist? "#{HOMEBREW_PREFIX}/.git" + + git = MacOS.locate("git") + # git isn't installed by older Xcodes + return false if git.nil? # /usr/bin/git is a popup stub when Xcode/CLT aren't installed, so bail out - return false if git_dir == "/usr/bin" && !MacOS.has_apple_developer_tools? + return false if git.dirname.to_s == "/usr/bin" && !MacOS.has_apple_developer_tools? path.parent.cd do diff = Utils.popen_read("git", "diff", "origin/master", "--", "#{path}") -- cgit v1.2.3