From b6b1e7fd17e4f92b0a79df34cd7668f42b977a24 Mon Sep 17 00:00:00 2001
From: hugues <hugues@a0e5b806-a6f9-0310-978d-cbce73f8a913>
Date: Wed, 25 Jul 2007 11:53:15 +0000
Subject: Plus de gestion du status GIT, ça prend trop de temps..
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+ssh://hugues@maison/opt/svn/private/hugues@515 a0e5b806-a6f9-0310-978d-cbce73f8a913
---
 11_Prompts.zsh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/11_Prompts.zsh b/11_Prompts.zsh
index 16fbf97..135dfcf 100644
--- a/11_Prompts.zsh
+++ b/11_Prompts.zsh
@@ -89,10 +89,9 @@ precmd ()
 
 	DATE=$(date "+%H:%M:%S-%d/%m/%Y")
 	ERROR=%(? "---" "%3<<"$C_$COLOR_BAR$_C"--"$C_$COLOR_ERRR$_C"%?%<<")
-	SVNREV=${$(svn info 2>&-):+$C_$COLOR_DOUBLEDOT$_C:$C_$COLOR_STATUS$_C"r$(svn info | tail -n+5 | head -n1 | cut -d' ' -f3)"}
+	GITBRANCH=${$(git branch 2>&-):+$C_$COLOR_DOUBLEDOT$_C:$C_$COLOR_BRANCH$_C$(git branch | grep '^\* ' | cut -c3-)}
 	if [ $(svn status 2>&- | grep -v '^?' | wc -l) -gt 0 ] ; then COLOR_STATUS=$COLOR_BRANCH\;$YELLOW ; else COLOR_STATUS=$COLOR_BRANCH ; fi
-	[ "$SVNREV" = "" ] && if [ $(git status 2>&- | grep -E '^# ([[:alpha:]]+ )+but not( [[:alpha:]]+)+:$' | wc -l) -gt 0 ] ; then COLOR_STATUS=$COLOR_BRANCH\;$YELLOW ; else COLOR_STATUS=$COLOR_BRANCH ; fi
-	GITBRANCH=${$(git branch 2>&-):+$C_$COLOR_DOUBLEDOT$_C:$C_$COLOR_STATUS$_C$(git branch | grep '^\* ' | cut -c3-)}
+	SVNREV=${$(svn info 2>&-):+$C_$COLOR_DOUBLEDOT$_C:$C_$COLOR_STATUS$_C"r$(svn info | tail -n+5 | head -n1 | cut -d' ' -f3)"}
 	CURDIR=$C_$COLOR_PATH$_C"%(!.%d.%(5~:.../:)%4~)"$C_$VOID$_C"$GITBRANCH$SVNREV"
 	unset HBAR
 	for _hbar in {1..$(($COLUMNS - ${#DATE} - 3 - 2))}
-- 
cgit v1.2.3