diff options
author | Tuowen Zhao <ztuowen@gmail.com> | 2020-07-04 11:54:44 -0600 |
---|---|---|
committer | Tuowen Zhao <ztuowen@gmail.com> | 2020-07-04 11:54:44 -0600 |
commit | 59344b5c59b7190ad3b14a2e8e02db8b5559141b (patch) | |
tree | a8e7ede89d3b896967d7d18d071107bd06c77897 /lib/git.zsh | |
parent | a3be2e4084285d7625e63bfe4b951c58143e3c9c (diff) | |
parent | a15f0f0e9ff17c1ca5c6d694d732e72c7c03a62b (diff) | |
download | zsh-59344b5c59b7190ad3b14a2e8e02db8b5559141b.tar.gz zsh-59344b5c59b7190ad3b14a2e8e02db8b5559141b.tar.bz2 zsh-59344b5c59b7190ad3b14a2e8e02db8b5559141b.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'lib/git.zsh')
-rw-r--r-- | lib/git.zsh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/git.zsh b/lib/git.zsh index 00cb00b19..f7d4738ca 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -14,10 +14,10 @@ function parse_git_dirty() { local -a FLAGS FLAGS=('--porcelain') if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then - if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then + if [[ "${DISABLE_UNTRACKED_FILES_DIRTY:-}" == "true" ]]; then FLAGS+='--untracked-files=no' fi - case "$GIT_STATUS_IGNORE_SUBMODULES" in + case "${GIT_STATUS_IGNORE_SUBMODULES:-}" in git) # let git decide (this respects per-repo config in .gitmodules) ;; |