mirror of
https://github.com/pyenv/pyenv-update.git
synced 2026-02-05 18:47:36 +09:00
Don't use `git pull --tags' for compatibility with Git 1.8.3 (#19)
This commit is contained in:
parent
7c4c4f10ab
commit
b46df06b06
@ -55,7 +55,13 @@ update_repo() {
|
|||||||
info "Updating $1..."
|
info "Updating $1..."
|
||||||
verify_repo "$1" &&
|
verify_repo "$1" &&
|
||||||
# pyenv-installer makes the repos shallow, so tags are not fetched by default
|
# pyenv-installer makes the repos shallow, so tags are not fetched by default
|
||||||
( cd "${repo}" && git pull --tags --no-rebase --ff "${REMOTE}" "${BRANCH_CHOICE}" )
|
# Git 1.8.3 (RHEL/CentOS 7)'s `pull' doesn't support `--tags'
|
||||||
|
# so we have to fetch as a separate step.
|
||||||
|
(
|
||||||
|
cd "${repo}" && \
|
||||||
|
git fetch --tags "${REMOTE}" "${BRANCH_CHOICE}" && \
|
||||||
|
git merge --ff "${REMOTE}" "${BRANCH_CHOICE}"
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
info() {
|
info() {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user