From 87d39f5dd2965d38bd9b66fd31e5d6b4593f53ed Mon Sep 17 00:00:00 2001 From: Parth Laxmikant Kolekar Date: Thu, 26 Oct 2017 22:54:26 +0530 Subject: [PATCH] Update init.zsh It seems that my older git does not support '@' yet. --- init.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.zsh b/init.zsh index 67a07cb6..18525ca8 100644 --- a/init.zsh +++ b/init.zsh @@ -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