simplified branch checking

This commit is contained in:
Prashan Dharmasena 2013-08-12 00:25:51 -04:00
commit 10f2f2fbe2

View file

@ -1,5 +1,5 @@
function venv {
[ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`')'
[ $VIRTUAL_ENV ] && echo '['`basename $VIRTUAL_ENV`']'
}
function git_status {
@ -13,15 +13,13 @@ function git_status {
}
function git_branch {
ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$ZSH_THEME_GIT_PROMPT_SUFFIX"
echo "$ZSH_THEME_GIT_PROMPT_PREFIX$(command git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/' )$ZSH_THEME_GIT_PROMPT_SUFFIX"
}
PROMPT=' $(git_status) %{$fg_bold[green]%}%3~ » '
RPROMPT='%{$fg_bold[magenta]%}$(venv)$(git_branch)%{$fg_bold[green]%}%D{%l:%M:%S}%{$reset_color%}'
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}[%{$fg[cyan]%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[green]%}]%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[cyan]%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[yellow]%}(╯°□°)╯︵ ┻━┻"
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}┬─┬ノ( ゜-゜ノ)"