mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-02-06 02:51:32 +01:00
Merge a052271af3 into 27c6becffd
This commit is contained in:
commit
12432b8037
1 changed files with 42 additions and 40 deletions
82
lib/git.zsh
82
lib/git.zsh
|
|
@ -69,47 +69,49 @@ function git_prompt_long_sha() {
|
||||||
|
|
||||||
# Get the status of the working tree
|
# Get the status of the working tree
|
||||||
git_prompt_status() {
|
git_prompt_status() {
|
||||||
INDEX=$(git status --porcelain -b 2> /dev/null)
|
|
||||||
STATUS=""
|
STATUS=""
|
||||||
if $(echo "$INDEX" | grep -E '^\?\? ' &> /dev/null); then
|
if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
|
INDEX=$(git status --porcelain -b 2> /dev/null)
|
||||||
fi
|
if $(echo "$INDEX" | grep -E '^\?\? ' &> /dev/null); then
|
||||||
if $(echo "$INDEX" | grep '^A ' &> /dev/null); then
|
STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
|
fi
|
||||||
elif $(echo "$INDEX" | grep '^M ' &> /dev/null); then
|
if $(echo "$INDEX" | grep '^A ' &> /dev/null); then
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
|
STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
|
||||||
fi
|
elif $(echo "$INDEX" | grep '^M ' &> /dev/null); then
|
||||||
if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
|
STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
|
fi
|
||||||
elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
|
if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
|
STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
|
||||||
elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
|
elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
|
STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
|
||||||
fi
|
elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
|
||||||
if $(echo "$INDEX" | grep '^R ' &> /dev/null); then
|
STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
|
fi
|
||||||
fi
|
if $(echo "$INDEX" | grep '^R ' &> /dev/null); then
|
||||||
if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
|
STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
|
fi
|
||||||
elif $(echo "$INDEX" | grep '^D ' &> /dev/null); then
|
if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
|
STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
|
||||||
elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
|
elif $(echo "$INDEX" | grep '^D ' &> /dev/null); then
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
|
STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
|
||||||
fi
|
elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
|
||||||
if $(git rev-parse --verify refs/stash >/dev/null 2>&1); then
|
STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
|
fi
|
||||||
fi
|
if $(git rev-parse --verify refs/stash >/dev/null 2>&1); then
|
||||||
if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
|
STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
|
fi
|
||||||
fi
|
if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
|
||||||
if $(echo "$INDEX" | grep '^## .*ahead' &> /dev/null); then
|
STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS"
|
fi
|
||||||
fi
|
if $(echo "$INDEX" | grep '^## .*ahead' &> /dev/null); then
|
||||||
if $(echo "$INDEX" | grep '^## .*behind' &> /dev/null); then
|
STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS"
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS"
|
fi
|
||||||
fi
|
if $(echo "$INDEX" | grep '^## .*behind' &> /dev/null); then
|
||||||
if $(echo "$INDEX" | grep '^## .*diverged' &> /dev/null); then
|
STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS"
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
|
fi
|
||||||
|
if $(echo "$INDEX" | grep '^## .*diverged' &> /dev/null); then
|
||||||
|
STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
echo $STATUS
|
echo $STATUS
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue