diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-09-28 08:52:03 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-09-28 08:52:03 -0400 |
| commit | e4fdb083655fc582ebcecb07cd1bd1130077f0e4 (patch) | |
| tree | fee07d9adfee79d1c88206ead154a23520ac51cb /lib/git.zsh | |
| parent | 5c8b0cc0c1782b34790548498018fb9e0300992b (diff) | |
| parent | b05ef1034fffd7b0c29f1558a8a357ccce7ae74b (diff) | |
| download | zsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.tar.gz zsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.tar.bz2 zsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.zip | |
Merge branch 'master' into copyfile-portability
Diffstat (limited to 'lib/git.zsh')
| -rw-r--r-- | lib/git.zsh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/git.zsh b/lib/git.zsh index caa7e6329..1e203c7c6 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -36,7 +36,10 @@ 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 ] + 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%}" |