From bbe7ba6f4f6840e6bf80b0a1f7c18384e820a8df Mon Sep 17 00:00:00 2001
From: ArcheyDevil <archeydevil@gmail.com>
Date: Tue, 24 Apr 2012 17:14:53 +1000
Subject: [PATCH] Thought I patched this already, but apperently not. So here
 it is.. using zsh regexp instead of the grep for the git library..

---
 lib/git.zsh | 52 +++++++++++++++++++++++-----------------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 74da922dd..38a358d4c 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -32,33 +32,27 @@ function git_prompt_long_sha() {
 
 # Get the status of the working tree
 git_prompt_status() {
-  INDEX=$(git status -u --porcelain 2> /dev/null)
-  STATUS=""
-  if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^A  ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
-  elif $(echo "$INDEX" | grep '^M  ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-  elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-  elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
-  elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
-  fi
-  echo $STATUS
+  local indicators line untracked added modified renamed deleted
+  while IFS=$'\n' read line; do
+    if [[ "$line" =~ '^\?\? ' ]]; then
+      [[ -n $untracked ]] && continue || untracked='yes'
+      indicators="${ZSH_THEME_GIT_PROMPT_UNTRACKED}${indicators}"
+    elif [[ "$line" =~ '^(((A|M|D|T) )|(AD|AM|AT|MM)) ' ]]; then
+      [[ -n $added ]] && continue || added='yes'
+      indicators="${ZSH_THEME_GIT_PROMPT_ADDED}${indicators}"
+    elif [[ "$line" =~ '^(( (M|T))|(AM|AT|MM)) ' ]]; then
+      [[ -n $modified ]] && continue || modified='yes'
+      indicators="${ZSH_THEME_GIT_PROMPT_MODIFIED}${indicators}"
+    elif [[ "$line" =~ '^R ' ]]; then
+      [[ -n $renamed ]] && continue || renamed='yes'
+      indicators="${ZSH_THEME_GIT_PROMPT_RENAMED}${indicators}"
+    elif [[ "$line" =~ '^( D|AD) ' ]]; then
+      [[ -n $deleted ]] && continue || deleted='yes'
+      indicators="${ZSH_THEME_GIT_PROMPT_DELETED}${indicators}"
+    elif [[ "$line" =~ '^UU ' ]]; then
+      [[ -n $unmerged ]] && continue || unmerged='yes'
+      indicators="${ZSH_THEME_GIT_PROMPT_UNMERGED}${indicators}"
+    fi
+  done < <(git status --porcelain --untracked 2> /dev/null)
+  echo $indicators
 }