1
0
Fork 0

use local to avoid environment pollution

pull/5/head
Jonathan Dahan 13 years ago
parent 8603260648
commit 7fa256bbf0

@ -19,7 +19,7 @@ function upgrade_zsh() {
current_path=`pwd` current_path=`pwd`
cd ~/.oh-my-zsh cd ~/.oh-my-zsh
zstyle -t ':omz:plugin:upgrade' auto-commit || nocommit='--no-commit' zstyle -t ':omz:plugin:update-omz' auto-commit || local nocommit='--no-commit'
if git pull $nocommit --strategy=recursive -X ours origin master; then if git pull $nocommit --strategy=recursive -X ours origin master; then
zstyle -t ':omz:plugin:upgrade' color && printf '\033[0;34m%s\033[0m\n' zstyle -t ':omz:plugin:upgrade' color && printf '\033[0;34m%s\033[0m\n'

Loading…
Cancel
Save