diff options
| author | Robby Russell <robby@planetargon.com> | 2012-12-04 06:56:43 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2012-12-04 06:56:43 -0800 |
| commit | 78e3f38db77701b74073539629d636ac5ad3a67b (patch) | |
| tree | 83980e1dba1a43b216f6ed1a55615af8ce8cbfb9 /lib | |
| parent | d100354d0d2a8e62c735dcc6db92fb1f0b9edb0c (diff) | |
| parent | a3c2a2f6e8ff9db508070a905de056346386ef4f (diff) | |
| download | zsh-78e3f38db77701b74073539629d636ac5ad3a67b.tar.gz zsh-78e3f38db77701b74073539629d636ac5ad3a67b.tar.bz2 zsh-78e3f38db77701b74073539629d636ac5ad3a67b.zip | |
Merge pull request #1258 from caio/git-branch-status
Add branch status support to git_prompt_status
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/git.zsh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/git.zsh b/lib/git.zsh index 4eaa299f2..95dd3dd43 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -58,7 +58,7 @@ function git_prompt_long_sha() { # Get the status of the working tree git_prompt_status() { - INDEX=$(git status --porcelain 2> /dev/null) + INDEX=$(git status --porcelain -b 2> /dev/null) STATUS="" if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS" @@ -88,6 +88,15 @@ git_prompt_status() { if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS" fi + if $(echo "$INDEX" | grep '^## .*ahead' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS" + fi + if $(echo "$INDEX" | grep '^## .*behind' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS" + fi + if $(echo "$INDEX" | grep '^## .*diverged' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS" + fi echo $STATUS } |