|
@@ -10,23 +10,20 @@ function git_prompt_info() {
|
|
|
|
|
|
# Checks if working tree is dirty
|
|
|
parse_git_dirty() {
|
|
|
- local SUBMODULE_SYNTAX=''
|
|
|
- local GIT_STATUS=''
|
|
|
- local CLEAN_MESSAGE='nothing to commit (working directory clean)'
|
|
|
- if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
|
|
|
+ local STATUS=''
|
|
|
+ local FLAGS
|
|
|
+ FLAGS=('--porcelain')
|
|
|
+ if [[ "$(command git config --get oh-my-zsh.hide-status)" != "1" ]]; then
|
|
|
if [[ $POST_1_7_2_GIT -gt 0 ]]; then
|
|
|
- SUBMODULE_SYNTAX="--ignore-submodules=dirty"
|
|
|
+ FLAGS+='--ignore-submodules=dirty'
|
|
|
fi
|
|
|
if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then
|
|
|
- GIT_STATUS=$(command git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1)
|
|
|
- else
|
|
|
- GIT_STATUS=$(command git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
|
|
|
- fi
|
|
|
- if [[ -n $GIT_STATUS ]]; then
|
|
|
- echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
|
|
|
- else
|
|
|
- echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
|
|
|
+ FLAGS+='--untracked-files=no'
|
|
|
fi
|
|
|
+ STATUS=$(command git status ${FLAGS} 2> /dev/null | tail -n1)
|
|
|
+ fi
|
|
|
+ if [[ -n $STATUS ]]; then
|
|
|
+ echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
|
|
|
else
|
|
|
echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
|
|
|
fi
|
|
@@ -135,17 +132,19 @@ function git_compare_version() {
|
|
|
INSTALLED_GIT_VERSION=(${(s/./)INSTALLED_GIT_VERSION[3]});
|
|
|
|
|
|
for i in {1..3}; do
|
|
|
+ if [[ $INSTALLED_GIT_VERSION[$i] -gt $INPUT_GIT_VERSION[$i] ]]; then
|
|
|
+ echo 1
|
|
|
+ return 0
|
|
|
+ fi
|
|
|
if [[ $INSTALLED_GIT_VERSION[$i] -lt $INPUT_GIT_VERSION[$i] ]]; then
|
|
|
echo -1
|
|
|
return 0
|
|
|
fi
|
|
|
done
|
|
|
- echo 1
|
|
|
+ echo 0
|
|
|
}
|
|
|
|
|
|
#this is unlikely to change so make it all statically assigned
|
|
|
POST_1_7_2_GIT=$(git_compare_version "1.7.2")
|
|
|
#clean up the namespace slightly by removing the checker function
|
|
|
unset -f git_compare_version
|
|
|
-
|
|
|
-
|