mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-02-06 02:51:32 +01:00
Fix stash warning
This commit is contained in:
parent
2019548006
commit
80c9d3b45d
1 changed files with 23 additions and 15 deletions
|
|
@ -1,3 +1,6 @@
|
||||||
|
# author: Adrien Lecharpentier
|
||||||
|
# release date: 2013-06-25
|
||||||
|
|
||||||
function prompt_char {
|
function prompt_char {
|
||||||
if [[ $? -ne 0 ]]; then
|
if [[ $? -ne 0 ]]; then
|
||||||
echo "%{$fg_bold[red]%}»%{$reset_color%}"
|
echo "%{$fg_bold[red]%}»%{$reset_color%}"
|
||||||
|
|
@ -31,6 +34,10 @@ function git_show_branch {
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
|
||||||
|
STATUS="$STATUS $ZSH_THEME_GIT_PROMPT_STASH"
|
||||||
|
fi
|
||||||
|
|
||||||
STATUS=$STATUS${ZSH_THEME_GIT_PROMPT_SUFFIX}
|
STATUS=$STATUS${ZSH_THEME_GIT_PROMPT_SUFFIX}
|
||||||
echo $STATUS
|
echo $STATUS
|
||||||
}
|
}
|
||||||
|
|
@ -53,8 +60,9 @@ ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE="↓"
|
||||||
ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE="↑"
|
ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE="↑"
|
||||||
ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE="<>"
|
ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE="<>"
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_STASH="%{$fg[cyan]%}$"
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%}+"
|
ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%}+"
|
||||||
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%}*"
|
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%}*"
|
||||||
ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}-"
|
ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}-"
|
||||||
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%}?"
|
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%}?"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue