From e5941d0567910ed037bccc191ac5c5d41c8c2642 Mon Sep 17 00:00:00 2001
From: Steven Lindberg <stevenjohnlindberg@gmail.com>
Date: Wed, 30 Jan 2013 17:12:42 -0800
Subject: [PATCH] Added missing status case where a tracked file has both
 staged and unstaged changes.

---
 lib/git.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 3e14695bd..5943fee4b 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -67,10 +67,10 @@ git_prompt_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
+  elif $(echo "$INDEX" | grep '^M[M ] ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
+  if $(echo "$INDEX" | grep '^[M ]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"