diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2019-11-06 19:42:08 +0100 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2019-11-06 19:42:08 +0100 |
| commit | 4a9cd68ea630144d53e15bb47ef16f8d329ce0ca (patch) | |
| tree | 610d53883fc6f31649d0986eeaa506ab6be56e96 /lib | |
| parent | 0ec59e25c7f6ac11d0988082fef908ff753126a2 (diff) | |
| parent | b7e37cea90b2bc718c66f90c0f9d52d1aa49ca79 (diff) | |
| download | zsh-4a9cd68ea630144d53e15bb47ef16f8d329ce0ca.tar.gz zsh-4a9cd68ea630144d53e15bb47ef16f8d329ce0ca.tar.bz2 zsh-4a9cd68ea630144d53e15bb47ef16f8d329ce0ca.zip | |
Merge branch 'jokester/override--ignore-submodules' (#2214)
Closes #2214
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/git.zsh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/git.zsh b/lib/git.zsh index 640561e97..7affdec68 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -17,6 +17,16 @@ function parse_git_dirty() { if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then FLAGS+='--untracked-files=no' fi + case "$GIT_STATUS_IGNORE_SUBMODULES" in + git) + # let git decide (this respects per-repo config in .gitmodules) + ;; + *) + # if unset: ignore dirty submodules + # other values are passed to --ignore-submodules + FLAGS+="--ignore-submodules=${GIT_STATUS_IGNORE_SUBMODULES:-dirty}" + ;; + esac STATUS=$(command git status ${FLAGS} 2> /dev/null | tail -n1) fi if [[ -n $STATUS ]]; then |