diff options
| author | Patrick Moore <pat@finixpayments.com> | 2020-06-30 09:54:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-30 18:54:27 +0200 |
| commit | e606ac70514fe31e40af53b818f07a967d185185 (patch) | |
| tree | ccaaa8040b41133cacb9ac1d770f6fede8909f39 | |
| parent | c4ac0d43addd4b3108e56a0ec77ce2074d93c25e (diff) | |
| download | zsh-e606ac70514fe31e40af53b818f07a967d185185.tar.gz zsh-e606ac70514fe31e40af53b818f07a967d185185.tar.bz2 zsh-e606ac70514fe31e40af53b818f07a967d185185.zip | |
Handle unset variables in various parts of the codebase (#8944)
DISABLE_UNTRACKED_FILES_DIRTY, DISABLE_AUTO_TITLE, GIT_STATUS_IGNORE_SUBMODULES are not set
Handle these variables not being set with conditional access.
If the user has set -u option to report attempts to use undeclared / unassigned variable, accessing the variables needs to be conditional.
| -rw-r--r-- | lib/git.zsh | 4 | ||||
| -rw-r--r-- | lib/termsupport.zsh | 4 |
2 files changed, 4 insertions, 4 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) ;; diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh index e3237ca34..069b7f328 100644 --- a/lib/termsupport.zsh +++ b/lib/termsupport.zsh @@ -50,13 +50,13 @@ fi # Runs before showing the prompt function omz_termsupport_precmd { - [[ "$DISABLE_AUTO_TITLE" == true ]] && return + [[ "${DISABLE_AUTO_TITLE:-}" == true ]] && return title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE } # Runs before executing the command function omz_termsupport_preexec { - [[ "$DISABLE_AUTO_TITLE" == true ]] && return + [[ "${DISABLE_AUTO_TITLE:-}" == true ]] && return emulate -L zsh setopt extended_glob |