dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-12-22 17:28:01 +00:00
Code Issues Releases Wiki Activity

Update init.zsh

Browse Source 
It seems that my older git does not support '@' yet.
This commit is contained in:
Parth Laxmikant Kolekar 2017-10-26 22:54:26 +05:30 committed by Kaleb Elwert
parent cbcbedd694
commit 87d39f5dd2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init.zsh
View File

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