|
|
|
@ -34,9 +34,9 @@ function zprezto-update {
|
|
|
|
|
if [[ "$orig_branch" == "master" ]]; then
|
|
|
|
|
git fetch || return "$?"
|
|
|
|
|
local UPSTREAM=$(git rev-parse '@{u}')
|
|
|
|
|
local LOCAL=$(git rev-parse @)
|
|
|
|
|
local LOCAL=$(git rev-parse HEAD)
|
|
|
|
|
local REMOTE=$(git rev-parse "$UPSTREAM")
|
|
|
|
|
local BASE=$(git merge-base @ "$UPSTREAM")
|
|
|
|
|
local BASE=$(git merge-base HEAD "$UPSTREAM")
|
|
|
|
|
if [[ $LOCAL == $REMOTE ]]; then
|
|
|
|
|
printf "There are no updates.\n"
|
|
|
|
|
return 0
|
|
|
|
|