Resolving conflict when merging in 1570

13 years ago · 7cdb6d667c
parent d6a36b1756 9245a30868
commit 7cdb6d667c
1 changed files with 4 additions and 4 deletions
--- a/lib/git.zsh
+++ b/lib/git.zsh
@ -20,7 +20,7 @@ parse_git_dirty() {
    else
        GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1)
    fi
-    if [[ -n $GIT_STATUS && "$GIT_STATUS" != "$CLEAN_MESSAGE" ]]; then
+    if [[ -n $(git status -s ${SUBMODULE_SYNTAX} -uno  2> /dev/null) ]]; then
      echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
    else
      echo "$ZSH_THEME_GIT_PROMPT_CLEAN"