diff options
| author | Marc Cornellà <marc@mcornella.com> | 2024-04-19 18:47:21 +0200 |
|---|---|---|
| committer | Carlo Sala <carlosalag@protonmail.com> | 2024-04-22 10:59:34 +0200 |
| commit | 0c80a063c3ad9513b83589d377c501a8d85d63a6 (patch) | |
| tree | 451ced63d1fe5fc120ca72543bdd631dd262d7bd | |
| parent | f78c6b90fc18e2d0bb119ff549207463ce1d57a5 (diff) | |
| download | zsh-0c80a063c3ad9513b83589d377c501a8d85d63a6.tar.gz zsh-0c80a063c3ad9513b83589d377c501a8d85d63a6.tar.bz2 zsh-0c80a063c3ad9513b83589d377c501a8d85d63a6.zip | |
chore(async): reenable async prompt by default on zsh < 5.0.6 (#12358)
Fixes #12331
| -rw-r--r-- | lib/git.zsh | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/lib/git.zsh b/lib/git.zsh index 277c0b3e8..b257d01a4 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -39,21 +39,17 @@ function _omz_git_prompt_info() { echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref:gs/%/%%}${upstream:gs/%/%%}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}" } -# Use async version if setting is enabled, or undefined but zsh version is at least 5.0.6 -# https://github.com/ohmyzsh/ohmyzsh/issues/12331#issuecomment-2059460268 -if zstyle -t ':omz:alpha:lib:git' async-prompt \ - || { is-at-least 5.0.6 && zstyle -T ':omz:alpha:lib:git' async-prompt }; then +# Use async version if setting is enabled or undefined +if zstyle -T ':omz:alpha:lib:git' async-prompt; then function git_prompt_info() { - setopt localoptions noksharrays - if [[ -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]" ]]; then - echo -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]" + if [[ -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]}" ]]; then + echo -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]}" fi } function git_prompt_status() { - setopt localoptions noksharrays - if [[ -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]" ]]; then - echo -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]" + if [[ -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]}" ]]; then + echo -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]}" fi } |