xenua
/
prezto
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Update init.zsh 

It seems that my older git does not support '@' yet.
master
Parth Laxmikant Kolekar 7 years ago committed by Kaleb Elwert
parent
cbcbedd694
commit
87d39f5dd2
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      init.zsh

4
init.zsh
Unescape 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

Write Preview
Loading…
Cancel
Save