fix git-prompt bug where the INDEX would appear dirty if you had an unmerged change.

ashleydev.zsh-theme: add bold yellow to branch color if unmerged state preset; overrides the red dirty color.
This commit is contained in:
Ashley Dev 2011-11-30 10:04:41 -08:00
commit 8a013666f0
2 changed files with 4 additions and 1 deletions

View file

@ -192,7 +192,6 @@ git_prompt__dirty_state ()
if [[ "$line" = UU* ]]; then
GIT_PROMPT_DIRTY_STATE_INDEX_UNMERGED='yes'
GIT_PROMPT_DIRTY_STATE_INDEX_DIRTY='yes'
GIT_PROMPT_DIRTY_STATE_ANY_DIRTY='yes'
fi
done < <(git status --porcelain 2> /dev/null)