b7e37cea90b2bc718c66f90c0f9d52d1aa49ca79

Author
Marc Cornellà <marc.cornella@live.com>
Committer
Marc Cornellà <marc.cornella@live.com>
Date

Message

Clean up ignore submodules logic in parse_git_dirty

Diff

 1diff --git a/lib/git.zsh b/lib/git.zsh
 2index e8ef0d78d4c5e201febbc1929bddd06329f18f5e..7affdec68c367d8bec1e6e14a0abf104b546708f 100644
 3--- a/lib/git.zsh
 4+++ b/lib/git.zsh
 5@@ -18,16 +18,13 @@ function parse_git_dirty() {
 6       FLAGS+='--untracked-files=no'
 7     fi
 8     case "$GIT_STATUS_IGNORE_SUBMODULES" in
 9-      "")
10-        # if unset: ignore dirty submodules
11-        FLAGS+="--ignore-submodules=dirty"
12-        ;;
13-      "git")
14+      git)
15         # let git decide (this respects per-repo config in .gitmodules)
16         ;;
17       *)
18+        # if unset: ignore dirty submodules
19         # other values are passed to --ignore-submodules
20-        FLAGS+="--ignore-submodules=$GIT_STATUS_IGNORE_SUBMODULES"
21+        FLAGS+="--ignore-submodules=${GIT_STATUS_IGNORE_SUBMODULES:-dirty}"
22         ;;
23     esac
24     STATUS=$(command git status ${FLAGS} 2> /dev/null | tail -n1)