From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Sep 2016 23:49:45 +0000 (-0700)
Subject: Merge branch 'ls/travis-homebrew-path-fix' into maint
X-Git-Tag: v2.10.1~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d2a4131ec43f78c808e3f2b716f6d7e22cc2589e?hp=300e95f7df240a0f6efea09d5e21fcc350e5ce83

Merge branch 'ls/travis-homebrew-path-fix' into maint

The procedure to build Git on Mac OS X for Travis CI hardcoded the
internal directory structure we assumed HomeBrew uses, which was a
no-no.  The procedure has been updated to ask HomeBrew things we
need to know to fix this.

* ls/travis-homebrew-path-fix:
travis-ci: ask homebrew for its path instead of hardcoding it
---

diff --git a/.travis.yml b/.travis.yml
index 477c3d2efb..37a1e1fb6d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -78,7 +78,7 @@ before_install:
         FORMULA=$1
         SHA=$(brew fetch --force $FORMULA 2>&1 | grep ^SHA256: | cut -d ' ' -f 2)
         sed -E -i.bak "s/sha256 \"[0-9a-f]{64}\"/sha256 \"$SHA\"/g" \
-          /usr/local/Library/Taps/homebrew/homebrew-binary/$FORMULA.rb
+          "$(brew --repository homebrew/homebrew-binary)/$FORMULA.rb"
       }
       brew update --quiet
       brew tap homebrew/binary --quiet