diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-09-19 15:07:36 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-09-19 15:07:36 -0400 |
| commit | 6cddf7202b8ef5c2eb2dfc081d870dc9e751d646 (patch) | |
| tree | be3fe162edbc04946eea014a3612280d4909dc1e /lib/git.zsh | |
| parent | 82c76f6b5c2718622a532fb759231e8d24171413 (diff) | |
| parent | cbc1a0806e910f7b4eed07b992d3d88ff7cb1162 (diff) | |
| download | zsh-6cddf7202b8ef5c2eb2dfc081d870dc9e751d646.tar.gz zsh-6cddf7202b8ef5c2eb2dfc081d870dc9e751d646.tar.bz2 zsh-6cddf7202b8ef5c2eb2dfc081d870dc9e751d646.zip | |
Merge branch 'master' into installer-portable-colors
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..baf863717 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 + echo "$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%}" |