diff options
| author | Roman Kamyk <roman.kamyk@gmail.com> | 2011-09-15 12:56:40 +0200 |
|---|---|---|
| committer | Roman Kamyk <roman.kamyk@gmail.com> | 2011-09-15 12:56:40 +0200 |
| commit | 2b55ee07534ec34a699805dc35ca83ad8e22fc7a (patch) | |
| tree | 97f464ca865626aea1aa135e7eb9f629f4017171 /lib/git.zsh | |
| parent | f71647fa85267d558d0d69034902f53aeeed67ad (diff) | |
| parent | 762b55bb2bc0452ce3f5f2f21bc22b61936ef704 (diff) | |
| download | zsh-2b55ee07534ec34a699805dc35ca83ad8e22fc7a.tar.gz zsh-2b55ee07534ec34a699805dc35ca83ad8e22fc7a.tar.bz2 zsh-2b55ee07534ec34a699805dc35ca83ad8e22fc7a.zip | |
Merge branch 'master' of http://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'lib/git.zsh')
| -rw-r--r-- | lib/git.zsh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/git.zsh b/lib/git.zsh index e96f075be..f04343650 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -15,7 +15,7 @@ parse_git_dirty() { # Checks if there are commits ahead from remote function git_prompt_ahead() { - if $(echo "$(git log origin/master..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then + if $(echo "$(git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then echo "$ZSH_THEME_GIT_PROMPT_AHEAD" fi } @@ -54,9 +54,11 @@ git_prompt_status() { fi if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS" + elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS" fi if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS" fi echo $STATUS -}
\ No newline at end of file +} |