From 35c312987b80bfb17828561de4c9839a95f14357 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues@hiegel.fr>
Date: Thu, 19 Jan 2012 13:56:26 +0100
Subject: [Git] shows merges in progress even when there is no modifs..

---
 01_Functions.zsh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to '01_Functions.zsh')

diff --git a/01_Functions.zsh b/01_Functions.zsh
index 50d79c5..108d4f8 100644
--- a/01_Functions.zsh
+++ b/01_Functions.zsh
@@ -295,7 +295,12 @@ get_git_status ()
 			my_git_status="$git_colors[init_in_progress]"
 		fi
 	else
-		my_git_status="$git_colors[up_to_date]"
+		if [ -f $GIT_DIR/MERGE_HEAD ]
+		then
+			my_git_status="$git_colors[cached]"
+		else
+			my_git_status="$git_colors[up_to_date]"
+		fi
 	fi
 
 	echo $my_git_status
@@ -394,7 +399,7 @@ set_prompt_colors ()
 	git_colors[cached_and_not_up_to_date]="$prompt_colors[not_up_to_date];$color[bold]"
 	git_colors[not_up_to_date]="$prompt_colors[not_up_to_date];$color[normal]"     # git changes in working tree
 	git_colors[init_in_progress]="$color[black];$color[bold]"                        # initialization
-	git_colors[up_to_date]="$prompt_colors[up_to_date]"                                     # git up-to-date
+	git_colors[up_to_date]="$prompt_colors[up_to_date];$color[normal]"                                     # git up-to-date
 
 	guilt_colors[applied]=$git_colors[cached]
 	guilt_colors[unapplied]=$color[black]
-- 
cgit v1.2.3