4a9cd68ea630144d53e15bb47ef16f8d329ce0ca

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

Message

Merge branch 'jokester/override--ignore-submodules' (#2214)

Closes #2214

Diff

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