admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Formula#file_modified?: fix for Xcodes without git

Browse Source 
Fixes Homebrew/homebrew#43206.
This commit is contained in:
Misty De Meo 2015-08-24 20:10:53 -07:00
parent cb154116c5
commit 98bb638f29
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/formula.rb
View File

@ -765,10 +765,15 @@ class Formula
end end
def file_modified? 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 # /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 path.parent.cd do
diff = Utils.popen_read("git", "diff", "origin/master", "--", "#{path}") diff = Utils.popen_read("git", "diff", "origin/master", "--", "#{path}")