1
0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-12-22 16:18:00 +00:00

Updater: fix bug regarding source init in new updater logic

This commit is contained in:
Brian K. Christensen 2017-07-05 15:42:35 +02:00 committed by Kaleb Elwert
parent 09b333eb41
commit c6124d4d37

View File

@ -23,7 +23,7 @@ unset min_zsh_version
function zprezto-update () ( function zprezto-update () (
function cannot-fast-forward { function cannot-fast-forward {
local STATUS="$1" local STATUS="$1"
[[ "${STATUS}" ]] && printf "%s\n" "${STATUS}" [[ -n "${STATUS}" ]] && printf "%s\n" "${STATUS}"
printf "Unable to fast-forward the changes. You can fix this by " printf "Unable to fast-forward the changes. You can fix this by "
printf "running\ncd '%s' and then\n'git pull' " "${ZPREZTODIR}" printf "running\ncd '%s' and then\n'git pull' " "${ZPREZTODIR}"
printf "to manually pull and possibly merge in changes\n" printf "to manually pull and possibly merge in changes\n"