diff options
| author | L.C. Karssen <lennart@karssen.org> | 2016-03-07 22:09:02 +0100 |
|---|---|---|
| committer | L.C. Karssen <lennart@karssen.org> | 2016-03-07 22:09:02 +0100 |
| commit | cfac963772718723589bf7293be0a53f79511b24 (patch) | |
| tree | 1c0f680591d81ecfaff8932d07f8131f4a6fd45c /lib | |
| parent | 0a47451a462284d20c633a7d6b3431a71bf65759 (diff) | |
| parent | bd6dbd1d9b1fc8a523aaf588492eb3ed4113b49d (diff) | |
| download | zsh-cfac963772718723589bf7293be0a53f79511b24.tar.gz zsh-cfac963772718723589bf7293be0a53f79511b24.tar.bz2 zsh-cfac963772718723589bf7293be0a53f79511b24.zip | |
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/git.zsh | 4 |
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 |