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

formula: use which over locate

Browse Source
This commit is contained in:
Dominyk Tiller 2015-08-25 04:18:46 +01:00
parent 98bb638f29
commit b808eed08f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/formula.rb
View File

@ -768,12 +768,12 @@ class Formula
# New Homebrew installs may not be a git repo yet
return false unless File.exist? "#{HOMEBREW_PREFIX}/.git"
git = MacOS.locate("git")
git = which("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.dirname.to_s == "/usr/bin" && !MacOS.has_apple_developer_tools?
return false if git == "/usr/bin/git" && !MacOS.has_apple_developer_tools?
path.parent.cd do
diff = Utils.popen_read("git", "diff", "origin/master", "--", "#{path}")