diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2016-04-04 20:39:10 +0200 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2016-04-04 20:39:10 +0200 |
| commit | e1b04cfecd87d1e39656be07df8f73a4ea113b8d (patch) | |
| tree | 91ed724bea67d63cc66700a2acb858c9ba0bcf23 | |
| parent | 286c3e5e28b651c3f629e6aaba589a1cf56da4d8 (diff) | |
| download | zsh-e1b04cfecd87d1e39656be07df8f73a4ea113b8d.tar.gz zsh-e1b04cfecd87d1e39656be07df8f73a4ea113b8d.tar.bz2 zsh-e1b04cfecd87d1e39656be07df8f73a4ea113b8d.zip | |
Fix logic of bureau_git_status function
This separates the gathering of file status, repository status and
stash.
| -rw-r--r-- | themes/bureau.zsh-theme | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme index c6296500d..9b1759c1b 100644 --- a/themes/bureau.zsh-theme +++ b/themes/bureau.zsh-theme @@ -22,10 +22,12 @@ bureau_git_branch () { echo "${ref#refs/heads/}" } -bureau_git_status () { +bureau_git_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 _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STAGED" fi @@ -38,22 +40,26 @@ bureau_git_status () { if $(echo "$_INDEX" | command grep '^UU ' &> /dev/null); then _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED" fi - if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then - _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STASHED" - fi - if $(echo "$_INDEX" | command grep '^## .*ahead' &> /dev/null); then - _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_AHEAD" - fi - if $(echo "$_INDEX" | command grep '^## .*behind' &> /dev/null); then - _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_BEHIND" - 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 + # check status of local repository + _INDEX=$(command git status --porcelain -b 2> /dev/null) + if $(echo "$_INDEX" | command grep '^## .*ahead' &> /dev/null); then + _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_AHEAD" + fi + if $(echo "$_INDEX" | command grep '^## .*behind' &> /dev/null); then + _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_BEHIND" + fi + if $(echo "$_INDEX" | command grep '^## .*diverged' &> /dev/null); then + _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_DIVERGED" + fi + + if $(command git rev-parse --verify refs/stash &> /dev/null); then + _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STASHED" + fi + echo $_STATUS } |