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

update: use git from ENV/scm/git

Browse Source 
The idea is to let `scm/git` to handle all of git location resolution
throughout Homebrew codebase.

Closes Homebrew/homebrew#50116.

Signed-off-by: Xu Cheng <xucheng@me.com>
This commit is contained in:
Xu Cheng 2016-03-15 17:39:32 +08:00
parent e0e277ecde
commit 99155c3b5f
1 changed files with 3 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Library/Homebrew/cmd/update.sh
View File

@ -3,42 +3,7 @@ brew() {
} }
git() { git() {
[[ -n "$HOMEBREW_GIT" ]] || odie "HOMEBREW_GIT is unset!" "$HOMEBREW_LIBRARY/ENV/scm/git" "$@"
"$HOMEBREW_GIT" "$@"
}
which_git() {
local git_path
local active_developer_dir
if [[ -n "$HOMEBREW_GIT" ]]
then
git_path="$HOMEBREW_GIT"
elif [[ -n "$GIT" ]]
then
git_path="$GIT"
else
git_path="git"
fi
git_path="$(which "$git_path" 2>/dev/null)"
if [[ -n "$git_path" ]]
then
git_path="$(chdir "${git_path%/*}" && pwd -P)/${git_path##*/}"
fi
if [[ -n "$HOMEBREW_OSX" && "$git_path" = "/usr/bin/git" ]]
then
active_developer_dir="$('/usr/bin/xcode-select' -print-path 2>/dev/null)"
if [[ -n "$active_developer_dir" && -x "$active_developer_dir/usr/bin/git" ]]
then
git_path="$active_developer_dir/usr/bin/git"
else
git_path=""
fi
fi
echo "$git_path"
} }
git_init_if_necessary() { git_init_if_necessary() {
@ -291,12 +256,10 @@ EOS
odie "$HOMEBREW_REPOSITORY must be writable!" odie "$HOMEBREW_REPOSITORY must be writable!"
fi fi
HOMEBREW_GIT="$(which_git)" if ! git --version >/dev/null 2>&1
if [[ -z "$HOMEBREW_GIT" ]]
then then
brew install git brew install git
HOMEBREW_GIT="$(which_git)" if ! git --version >/dev/null 2>&1
if [[ -z "$HOMEBREW_GIT" ]]
then then
odie "Git must be installed and in your PATH!" odie "Git must be installed and in your PATH!"
fi fi