|
|
|
|
@ -85,6 +85,9 @@ git_prompt_status() { |
|
|
|
|
elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then |
|
|
|
|
STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS" |
|
|
|
|
fi |
|
|
|
|
if $(git rev-parse --verify refs/stash >/dev/null 2>&1); then |
|
|
|
|
STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS" |
|
|
|
|
fi |
|
|
|
|
if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then |
|
|
|
|
STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS" |
|
|
|
|
fi |
|
|
|
|
@ -102,7 +105,7 @@ git_prompt_status() { |
|
|
|
|
|
|
|
|
|
#compare the provided version of git to the version installed and on path |
|
|
|
|
#prints 1 if input version <= installed version |
|
|
|
|
#prints -1 otherwise |
|
|
|
|
#prints -1 otherwise |
|
|
|
|
function git_compare_version() { |
|
|
|
|
local INPUT_GIT_VERSION=$1; |
|
|
|
|
local INSTALLED_GIT_VERSION |
|
|
|
|
|