Fix git_prompt_status() not showing ahead/behind/diverged status correctly (#5388)

27fff272 · Yuichi Tanikawa · Marc Cornellà · 71201ffd · 27fff272
隐藏空白更改
内联并排

Showing with 3 addition and 3 deletion

lib/git.zsh lib/git.zsh +3 -3

未找到文件。
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -165,13 +165,13 @@ function git_prompt_status() {
  if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
    STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
  fi
-  if $(echo "$INDEX" | grep '^## .*ahead' &> /dev/null); then
+  if $(echo "$INDEX" | grep '^## [^ ]\+ .*ahead' &> /dev/null); then
    STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS"
  fi
-  if $(echo "$INDEX" | grep '^## .*behind' &> /dev/null); then
+  if $(echo "$INDEX" | grep '^## [^ ]\+ .*behind' &> /dev/null); then
    STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS"
  fi
-  if $(echo "$INDEX" | grep '^## .*diverged' &> /dev/null); then
+  if $(echo "$INDEX" | grep '^## [^ ]\+ .*diverged' &> /dev/null); then
    STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
  fi
  echo $STATUS