linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-13 03:01:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

enable display of dirty unmerged status in git prompt

Browse source
This commit is contained in:
mafro 2014-04-04 01:51:32 +00:00
commit 7b90c97e5f
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/git.zsh
View file

@ -23,7 +23,16 @@ parse_git_dirty() {
GIT_STATUS=$(command git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
fi
if [[ -n $GIT_STATUS ]]; then
echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
# display dirty unmerged status
if [[ ! -z "$ZSH_THEME_GIT_PROMPT_DIRTY_UNMERGED" ]]; then
if $(echo "$(command git status --porcelain -b 2> /dev/null)" | grep -E '^(AA|UU) ' &> /dev/null); then
echo "$ZSH_THEME_GIT_PROMPT_DIRTY_UNMERGED"
else
echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
fi
else
echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
fi
else
echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
fi