1
0
mirror of https://github.com/pyenv/pyenv.git synced 2025-11-16 15:23:53 -05:00

Merge remote-tracking branch 'rbenv/master' into rbenv-20151121

This commit is contained in:
Yamashita, Yuu
2015-11-21 04:13:52 +00:00
24 changed files with 309 additions and 111 deletions

View File

@@ -13,10 +13,14 @@ set -e
[ -n "$PYENV_DEBUG" ] && set -x
version="20151105"
git_revision=""
if cd "$PYENV_ROOT" 2>/dev/null; then
git_revision="$(git describe --tags HEAD 2>/dev/null || true)"
git_revision="${git_revision#v}"
fi
for source_dir in "${BASH_SOURCE%/*}" "$PYENV_ROOT"; do
if cd "$source_dir" 2>/dev/null && git remote -v 2>/dev/null | grep -q pyenv; then
git_revision="$(git describe --tags HEAD 2>/dev/null || true)"
git_revision="${git_revision#v}"
[ -z "$git_revision" ] || break
fi
done
echo "pyenv ${git_revision:-$version}"