summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2015-09-19 08:49:57 -0700
committerRobby Russell <robby@planetargon.com>2015-09-19 08:49:57 -0700
commit8cf88f2b04668a425a5a4f470ad5f3c91dfea3eb (patch)
treeca8ceb0f81337f8a3c7c027a4a87e24293617c99 /lib
parentbaf1aa13cb9ae4eb21dd869f0de5c7d29df1aba7 (diff)
parent01e355fb1e5dc3982efeecee699a96254f3f44e6 (diff)
downloadzsh-8cf88f2b04668a425a5a4f470ad5f3c91dfea3eb.tar.gz
zsh-8cf88f2b04668a425a5a4f470ad5f3c91dfea3eb.tar.bz2
zsh-8cf88f2b04668a425a5a4f470ad5f3c91dfea3eb.zip
Merge pull request #3911 from mbologna/git_remote_status_equal
added ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE
Diffstat (limited to 'lib')
-rw-r--r--lib/git.zsh5
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%}"