adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix logic of bureau_git_status function

Browse Source 
This separates the gathering of file status, repository status and
stash.
This commit is contained in:
Marc Cornellà 2016-04-04 20:39:10 +02:00
parent 286c3e5e28
commit e1b04cfecd
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
themes/bureau.zsh-theme
View File

@ -24,8 +24,10 @@ bureau_git_branch () {
bureau_git_status() { bureau_git_status() {
_STATUS="" _STATUS=""
if [[ $(command git status --short 2> /dev/null) != "" ]]; then
_INDEX=$(command git status --porcelain -b 2> /dev/null) # check status of files
_INDEX=$(command git status --porcelain 2> /dev/null)
if [[ -n "$_INDEX" ]]; then
if $(echo "$_INDEX" | command grep '^[AMRD]. ' &> /dev/null); then if $(echo "$_INDEX" | command grep '^[AMRD]. ' &> /dev/null); then
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STAGED" _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STAGED"
fi fi
@ -38,9 +40,12 @@ bureau_git_status () {
if $(echo "$_INDEX" | command grep '^UU ' &> /dev/null); then if $(echo "$_INDEX" | command grep '^UU ' &> /dev/null); then
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED" _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"
fi fi
if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then else
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STASHED" _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
fi fi
# check status of local repository
_INDEX=$(command git status --porcelain -b 2> /dev/null)
if $(echo "$_INDEX" | command grep '^## .*ahead' &> /dev/null); then if $(echo "$_INDEX" | command grep '^## .*ahead' &> /dev/null); then
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_AHEAD" _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_AHEAD"
fi fi
@ -50,8 +55,9 @@ bureau_git_status () {
if $(echo "$_INDEX" | command grep '^## .*diverged' &> /dev/null); then if $(echo "$_INDEX" | command grep '^## .*diverged' &> /dev/null); then
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_DIVERGED" _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_DIVERGED"
fi fi
else
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_CLEAN" if $(command git rev-parse --verify refs/stash &> /dev/null); then
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STASHED"
fi fi
echo $_STATUS echo $_STATUS