Merge pull request #2323 from michaelorr/slow-git-fix

Renaming config for parse_git_dirty() to avoid collision
This commit is contained in:
Robby Russell 2014-11-06 09:15:00 -08:00
commit 160abc9a8d

View File

@ -13,7 +13,7 @@ parse_git_dirty() {
local SUBMODULE_SYNTAX='' local SUBMODULE_SYNTAX=''
local GIT_STATUS='' local GIT_STATUS=''
local CLEAN_MESSAGE='nothing to commit (working directory clean)' local CLEAN_MESSAGE='nothing to commit (working directory clean)'
if [[ "$(command git config --get oh-my-zsh.hide-status)" != "1" ]]; then if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
if [[ $POST_1_7_2_GIT -gt 0 ]]; then if [[ $POST_1_7_2_GIT -gt 0 ]]; then
SUBMODULE_SYNTAX="--ignore-submodules=dirty" SUBMODULE_SYNTAX="--ignore-submodules=dirty"
fi fi