diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2019-11-06 19:41:13 +0100 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2019-11-06 19:41:13 +0100 |
| commit | b7e37cea90b2bc718c66f90c0f9d52d1aa49ca79 (patch) | |
| tree | 610d53883fc6f31649d0986eeaa506ab6be56e96 /lib/git.zsh | |
| parent | 7cc3a32bff9b283bf5eea139b92cbfddf3b75de5 (diff) | |
| download | zsh-b7e37cea90b2bc718c66f90c0f9d52d1aa49ca79.tar.gz zsh-b7e37cea90b2bc718c66f90c0f9d52d1aa49ca79.tar.bz2 zsh-b7e37cea90b2bc718c66f90c0f9d52d1aa49ca79.zip | |
Clean up ignore submodules logic in parse_git_dirty
Diffstat (limited to 'lib/git.zsh')
| -rw-r--r-- | lib/git.zsh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/git.zsh b/lib/git.zsh index e8ef0d78d..7affdec68 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -18,16 +18,13 @@ function parse_git_dirty() { FLAGS+='--untracked-files=no' fi case "$GIT_STATUS_IGNORE_SUBMODULES" in - "") - # if unset: ignore dirty submodules - FLAGS+="--ignore-submodules=dirty" - ;; - "git") + 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" + FLAGS+="--ignore-submodules=${GIT_STATUS_IGNORE_SUBMODULES:-dirty}" ;; esac STATUS=$(command git status ${FLAGS} 2> /dev/null | tail -n1) |