0c80a063c3ad9513b83589d377c501a8d85d63a6

Author
Marc Cornellà <marc@mcornella.com>
Committer
Carlo Sala <carlosalag@protonmail.com>
Date

Message

chore(async): reenable async prompt by default on zsh < 5.0.6 (#12358)

Fixes #12331

Diff

 1diff --git a/lib/git.zsh b/lib/git.zsh
 2index 277c0b3e891fd4467550a9b51d4d8e31705614e2..b257d01a482acdf24ba87c978bc907c15a051e9d 100644
 3--- a/lib/git.zsh
 4+++ b/lib/git.zsh
 5@@ -39,21 +39,17 @@ function _omz_git_prompt_info() {
 6   echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref:gs/%/%%}${upstream:gs/%/%%}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
 7 }
 8 
 9-# Use async version if setting is enabled, or undefined but zsh version is at least 5.0.6
10-# https://github.com/ohmyzsh/ohmyzsh/issues/12331#issuecomment-2059460268
11-if zstyle -t ':omz:alpha:lib:git' async-prompt \
12-  || { is-at-least 5.0.6 && zstyle -T ':omz:alpha:lib:git' async-prompt }; then
13+# Use async version if setting is enabled or undefined
14+if zstyle -T ':omz:alpha:lib:git' async-prompt; then
15   function git_prompt_info() {
16-    setopt localoptions noksharrays
17-    if [[ -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]" ]]; then
18-      echo -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]"
19+    if [[ -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]}" ]]; then
20+      echo -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]}"
21     fi
22   }
23 
24   function git_prompt_status() {
25-    setopt localoptions noksharrays
26-    if [[ -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]" ]]; then
27-      echo -n "$_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]"
28+    if [[ -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]}" ]]; then
29+      echo -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]}"
30     fi
31   }
32