Browse Source

Merge pull request #1834 from croach/disable_untracked_files_dirty_fix

Adding a fix for the DISABLE_UNTRACKED_FILES_DIRTY option.
Robby Russell 11 years ago
parent
commit
79196f8213
1 changed files with 4 additions and 4 deletions
  1. 4 4
      lib/git.zsh

+ 4 - 4
lib/git.zsh

@@ -15,12 +15,12 @@ parse_git_dirty() {
     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
-    if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" != "true" ]]; then
-        GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
-    else
+    if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then
         GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1)
         GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1)
+    else
+        GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
     fi
     fi
-    if [[ -n $(git status -s ${SUBMODULE_SYNTAX} -uno  2> /dev/null) ]]; then
+    if [[ -n $GIT_STATUS ]]; then
       echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
       echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
     else
     else
       echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
       echo "$ZSH_THEME_GIT_PROMPT_CLEAN"