Merging geoffgarside work

This commit is contained in:
Robby Russell 2009-08-31 15:09:34 -07:00
commit 00cbdd6ed9
6 changed files with 44 additions and 10 deletions

View file

@ -3,7 +3,7 @@ function git_prompt_info() {
if [[ -d .git ]]; then
ref=$(git symbolic-ref HEAD 2> /dev/null) || return
branch=${ref#refs/heads/}
CURRENT_BRANCH="%{$fg[red]%}git:(%{$fg[green]${branch}%{$fg[red])"
CURRENT_BRANCH="git:(%{$fg[red]%}${branch}%{$fg[blue]%})%{$reset_color%}$(parse_git_dirty)"
else
CURRENT_BRANCH=''
fi
@ -12,5 +12,5 @@ function git_prompt_info() {
}
parse_git_dirty () {
[[ $(git status | tail -n1) != "nothing to commit (working directory clean)" ]] && echo "%{$fg[white] ♻ "
[[ $(git status | tail -n1) != "nothing to commit (working directory clean)" ]] && echo " %{$fg[yellow]%}✗%{$reset_color%}"
}