summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMichele Bologna <mbologna@users.noreply.github.com>2016-01-13 15:36:59 +0100
committerMichele Bologna <mbologna@users.noreply.github.com>2016-01-13 15:36:59 +0100
commit87f8251388ed2d99a430fd7f9695b8dc1048d3d2 (patch)
tree414c454a0819b666e1fb1df828c9a1feb2445485 /lib
parent686e46025890cba38d2cb7ad7cc229bf6beeba57 (diff)
downloadzsh-87f8251388ed2d99a430fd7f9695b8dc1048d3d2.tar.gz
zsh-87f8251388ed2d99a430fd7f9695b8dc1048d3d2.tar.bz2
zsh-87f8251388ed2d99a430fd7f9695b8dc1048d3d2.zip
Re-added $ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE
Re-added $ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE variable which was removed in 9f55213
Diffstat (limited to 'lib')
-rw-r--r--lib/git.zsh4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/git.zsh b/lib/git.zsh
index de51daafa..f91b516bd 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -37,7 +37,9 @@ function 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 -gt 0 ]] && [[ $behind -eq 0 ]]; then
+ if [[ $ahead -eq 0 ]] && [[ $behind -eq 0 ]]; then
+ git_remote_status="$ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE"
+ elif [[ $ahead -gt 0 ]] && [[ $behind -eq 0 ]]; then
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