mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-12 21:39:48 +01:00
Merge pull request #2752 from isqua/bureau_theme_fix
Fix checkmark for clean repo in bureau theme
This commit is contained in:
commit
7cc1eab6fa
1 changed files with 31 additions and 27 deletions
|
@ -23,31 +23,35 @@ bureau_git_branch () {
|
||||||
}
|
}
|
||||||
|
|
||||||
bureau_git_status () {
|
bureau_git_status () {
|
||||||
_INDEX=$(command git status --porcelain -b 2> /dev/null)
|
|
||||||
_STATUS=""
|
_STATUS=""
|
||||||
if $(echo "$_INDEX" | grep '^[AMRD]. ' &> /dev/null); then
|
if [[ $(command git status --short 2> /dev/null) != "" ]]; then
|
||||||
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STAGED"
|
_INDEX=$(command git status --porcelain -b 2> /dev/null)
|
||||||
fi
|
if $(echo "$_INDEX" | command grep '^[AMRD]. ' &> /dev/null); then
|
||||||
if $(echo "$_INDEX" | grep '^.[MTD] ' &> /dev/null); then
|
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STAGED"
|
||||||
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"
|
fi
|
||||||
fi
|
if $(echo "$_INDEX" | command grep '^.[MTD] ' &> /dev/null); then
|
||||||
if $(echo "$_INDEX" | command grep -E '^\?\? ' &> /dev/null); then
|
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"
|
||||||
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"
|
fi
|
||||||
fi
|
if $(echo "$_INDEX" | command grep -E '^\?\? ' &> /dev/null); then
|
||||||
if $(echo "$_INDEX" | grep '^UU ' &> /dev/null); then
|
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"
|
||||||
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"
|
fi
|
||||||
fi
|
if $(echo "$_INDEX" | command grep '^UU ' &> /dev/null); then
|
||||||
if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
|
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"
|
||||||
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STASHED"
|
fi
|
||||||
fi
|
if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
|
||||||
if $(echo "$_INDEX" | grep '^## .*ahead' &> /dev/null); then
|
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STASHED"
|
||||||
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_AHEAD"
|
fi
|
||||||
fi
|
if $(echo "$_INDEX" | command grep '^## .*ahead' &> /dev/null); then
|
||||||
if $(echo "$_INDEX" | grep '^## .*behind' &> /dev/null); then
|
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_AHEAD"
|
||||||
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_BEHIND"
|
fi
|
||||||
fi
|
if $(echo "$_INDEX" | command grep '^## .*behind' &> /dev/null); then
|
||||||
if $(echo "$_INDEX" | grep '^## .*diverged' &> /dev/null); then
|
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_BEHIND"
|
||||||
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_DIVERGED"
|
fi
|
||||||
|
if $(echo "$_INDEX" | command grep '^## .*diverged' &> /dev/null); then
|
||||||
|
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_DIVERGED"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo $_STATUS
|
echo $_STATUS
|
||||||
|
|
Loading…
Reference in a new issue