From ea88a545c99d45d467748b86d89c57cb6e44baf5 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues.hiegel@openwide.fr>
Date: Thu, 9 Jul 2009 11:14:16 +0200
Subject: [Funcs] test if git-rebase is in rebase-merge

---
 01_Functions.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '01_Functions.zsh')

diff --git a/01_Functions.zsh b/01_Functions.zsh
index 87bc5b4..6871852 100644
--- a/01_Functions.zsh
+++ b/01_Functions.zsh
@@ -129,7 +129,7 @@ get_git_branch ()
 			REBASE_DIR=$GIT_DIR/rebase-apply
 		fi
 
-		if [ -d $GIT_DIR/rebase-merge ]
+		if [ "$REBASE_DIR" = "$GIT_DIR/rebase-merge" ]
 		then
 			current=$(< $REBASE_DIR/done wc -l)
 			last=$(( $current + $(< $REBASE_DIR/git-rebase-todo grep -v "^#\|^[[:blank:]]*$" | wc -l) ))
-- 
cgit v1.2.3