aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2016-08-23 10:02:36 +0100
committerGitHub2016-08-23 10:02:36 +0100
commit4108c00bf2105e2aac4791f220bd5dfb6e91489f (patch)
treea9ea2c0178a0c25d87114fd4732e9c4d5bac6194 /Library
parenta70c60baeacf6ec6835fb0112fb5d1c9dd51012a (diff)
parentb6afa228f4974f4af1e8938911e35150aa2991c8 (diff)
downloadbrew-4108c00bf2105e2aac4791f220bd5dfb6e91489f.tar.bz2
Merge pull request #778 from MikeMcQuaid/update-full-git-path
update: make GIT_EXECUTABLE an absolute path.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/cmd/update.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh
index dbd1a4de8..7b57bde24 100644
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@@ -17,7 +17,10 @@ source "$HOMEBREW_LIBRARY/Homebrew/utils/lock.sh"
git() {
if [[ -z "$GIT_EXECUTABLE" ]]
then
- GIT_EXECUTABLE="$("$HOMEBREW_LIBRARY/Homebrew/shims/scm/git" --homebrew=print-path)"
+ GIT_EXECUTABLE_RELATIVE="$("$HOMEBREW_LIBRARY/Homebrew/shims/scm/git" --homebrew=print-path)"
+ GIT_EXECUTABLE_BASE="$(basename "$GIT_EXECUTABLE_RELATIVE")"
+ GIT_EXECUTABLE_DIR="$(cd "$(dirname "$GIT_EXECUTABLE_RELATIVE")" && pwd)"
+ GIT_EXECUTABLE="$GIT_EXECUTABLE_DIR/$GIT_EXECUTABLE_BASE"
fi
"$GIT_EXECUTABLE" "$@"
}