|
@@ -36,16 +36,26 @@ git_remote_status() {
|
|
|
ahead=$(command git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
|
|
|
behind=$(command git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
|
|
|
|
|
|
- if [ $ahead -eq 0 ] && [ $behind -gt 0 ]
|
|
|
+ if [ $ahead -gt 0 ] && [ $behind -eq 0 ]
|
|
|
then
|
|
|
- echo "$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE"
|
|
|
- elif [ $ahead -gt 0 ] && [ $behind -eq 0 ]
|
|
|
+ git_remote_status="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE"
|
|
|
+ git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}"
|
|
|
+ elif [ $behind -gt 0 ] && [ $ahead -eq 0 ]
|
|
|
then
|
|
|
- echo "$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE"
|
|
|
+ git_remote_status="$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE"
|
|
|
+ git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))%{$reset_color%}"
|
|
|
elif [ $ahead -gt 0 ] && [ $behind -gt 0 ]
|
|
|
then
|
|
|
- echo "$ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE"
|
|
|
+ git_remote_status="$ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE"
|
|
|
+ git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))%{$reset_color%}"
|
|
|
fi
|
|
|
+
|
|
|
+ if [ $ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED ]
|
|
|
+ then
|
|
|
+ git_remote_status="$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX$remote$git_remote_status_detailed$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX"
|
|
|
+ fi
|
|
|
+
|
|
|
+ echo $git_remote_status
|
|
|
fi
|
|
|
}
|
|
|
|