1
0
mirror of https://github.com/dcarrillo/prezto.git synced 2025-10-14 07:49:09 +00:00

[general] Miscellaneous cleanup and formatting

This commit is contained in:
Indrajit Raychaudhuri
2017-08-04 12:54:19 -05:00
parent 7b5196ca66
commit a60499f933
11 changed files with 18 additions and 19 deletions

View File

@@ -30,7 +30,7 @@ function zprezto-update {
printf "to manually pull and possibly merge in changes\n"
}
cd -q -- "${ZPREZTODIR}" || return 7
local orig_branch="$(git symbolic-ref HEAD 2>/dev/null | cut -d '/' -f 3)"
local orig_branch="$(git symbolic-ref HEAD 2> /dev/null | cut -d '/' -f 3)"
if [[ "$orig_branch" == "master" ]]; then
git fetch || return "$?"
local UPSTREAM=$(git rev-parse '@{u}')