7cdb6d667c12ff4944d7e68eb519cc5bd6735bc3

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Resolving conflict when merging in 1570

Diff

 1diff --git a/lib/git.zsh b/lib/git.zsh
 2index b023c9ac35ee8f8bdb7459caf91cfd87d6256f12..96598cf5f9c6bd4e6a1c301eaee823cc87f51582 100644
 3--- a/lib/git.zsh
 4+++ b/lib/git.zsh
 5@@ -14,20 +14,20 @@ parse_git_dirty() {
 6   if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then
 7     if [[ $POST_1_7_2_GIT -gt 0 ]]; then
 8           SUBMODULE_SYNTAX="--ignore-submodules=dirty"
 9-    fi  
10+    fi
11     if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" != "true" ]]; then
12         GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
13     else
14         GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1)
15     fi
16-    if [[ -n $GIT_STATUS && "$GIT_STATUS" != "$CLEAN_MESSAGE" ]]; then
17+    if [[ -n $(git status -s ${SUBMODULE_SYNTAX} -uno  2> /dev/null) ]]; then
18       echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
19     else
20       echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
21-    fi  
22+    fi
23   else
24     echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
25-  fi  
26+  fi
27 }
28 
29 # get the difference between the local and remote branches