linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-09 02:24:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Workaround for git status on old git

Browse source
This commit is contained in:
Nick Aldwin 2013-01-10 01:34:44 -05:00
commit b74742dd92
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/git.zsh
View file

@ -12,7 +12,15 @@ parse_git_dirty() {
if [[ $POST_1_7_2_GIT -gt 0 ]]; then
SUBMODULE_SYNTAX="--ignore-submodules=dirty"
fi
if [[ -n $(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null) ]]; then
local GIT_DIRTY=0
# see https://github.com/robbyrussell/oh-my-zsh/commit/3c87d483628267e48fc0f462f46488dcd4f87810
# and https://github.com/robbyrussell/oh-my-zsh/issues/40
if [[ $POST_1_6_1_GIT -gt 0 ]]; then
[[ -n $(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null) ]] && GIT_DIRTY=1
else
[[ $((git status 2> /dev/null) | tail -n1) != "nothing to commit (working directory clean)" ]] && GIT_DIRTY=1
fi
if (( GIT_DIRTY )); then
echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
else
echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
@ -124,6 +132,7 @@ function git_compare_version() {
#this is unlikely to change so make it all statically assigned
POST_1_7_2_GIT=$(git_compare_version "1.7.2")
POST_1_6_1_GIT=$(git_compare_version "1.6.1")
#clean up the namespace slightly by removing the checker function
unset -f git_compare_version