console/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-09-21 10:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(bureau): fix never CLEAN git status (#10656)

Browse Source 
Closes #10656
This commit is contained in:
Harris Miller 2022-02-04 13:08:03 -07:00 committed by Marc Cornellà
parent 2d3bae965a
commit 9e9831fcf2
No known key found for this signature in database
GPG Key ID: 0314585E776A9C1B
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
themes/bureau.zsh-theme
View File

@ -25,20 +25,21 @@ bureau_git_branch () {
bureau_git_status() {
local result gitstatus
gitstatus="$(command git status --porcelain -b 2>/dev/null)"
# check status of files
gitstatus=$(command git status --porcelain -b 2> /dev/null)
if [[ -n "$gitstatus" ]]; then
if $(echo "$gitstatus" | command grep -q '^[AMRD]. '); then
local gitfiles="$(tail -n +2 <<< "$gitstatus")"
if [[ -n "$gitfiles" ]]; then
if $(echo "$gitfiles" | command grep -q '^[AMRD]. '); then
result+="$ZSH_THEME_GIT_PROMPT_STAGED"
fi
if $(echo "$gitstatus" | command grep -q '^.[MTD] '); then
if $(echo "$gitfiles" | command grep -q '^.[MTD] '); then
result+="$ZSH_THEME_GIT_PROMPT_UNSTAGED"
fi
if $(echo "$gitstatus" | command grep -q -E '^\?\? '); then
if $(echo "$gitfiles" | command grep -q -E '^\?\? '); then
result+="$ZSH_THEME_GIT_PROMPT_UNTRACKED"
fi
if $(echo "$gitstatus" | command grep -q '^UU '); then
if $(echo "$gitfiles" | command grep -q '^UU '); then
result+="$ZSH_THEME_GIT_PROMPT_UNMERGED"
fi
else
@ -46,13 +47,14 @@ bureau_git_status() {
fi
# check status of local repository
if $(echo "$gitstatus" | command grep -q '^## .*ahead'); then
local gitbranch="$(head -n 1 <<< "$gitstatus")"
if $(echo "$gitbranch" | command grep -q '^## .*ahead'); then
result+="$ZSH_THEME_GIT_PROMPT_AHEAD"
fi
if $(echo "$gitstatus" | command grep -q '^## .*behind'); then
if $(echo "$gitbranch" | command grep -q '^## .*behind'); then
result+="$ZSH_THEME_GIT_PROMPT_BEHIND"
fi
if $(echo "$gitstatus" | command grep -q '^## .*diverged'); then
if $(echo "$gitbranch" | command grep -q '^## .*diverged'); then
result+="$ZSH_THEME_GIT_PROMPT_DIVERGED"
fi