From 338a732009d64d70ce5362fda3851208a9a65daf Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues.hiegel@qosmos.com>
Date: Tue, 13 Aug 2013 17:17:22 +0200
Subject: [Git] bisect fuck.

---
 01_Internal.zsh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to '01_Internal.zsh')

diff --git a/01_Internal.zsh b/01_Internal.zsh
index 259bde0..c0604af 100644
--- a/01_Internal.zsh
+++ b/01_Internal.zsh
@@ -296,12 +296,14 @@ __get_git_branch ()
 		onto=$(cat $REBASE_DIR/onto | cut -c-7)
 
 		# amended commit
-		amend=$(cat $REBASE_DIR/stopped-sha)
-		if [ "$amend" != "$(echo $commit_ish | cut -c-7)" ]
+		[ -e $REBASE_DIR/original-commit ] && amend=$(cat $REBASE_DIR/original-commit | cut -c-7)
+		[ -e $REBASE_DIR/stopped-sha ] && amend=$(cat $REBASE_DIR/stopped-sha)
+		#
+		if [ "$amend" != "$commit_ish" ]
 		then
 			#amend=$(git name-rev --name-only "$amend" 2>/dev/null | __cleanup_git_branch_name)
 			#[ "$amend" = "undefined" ] &&
-			amend=$(cat $REBASE_DIR/stopped-sha)
+			amend=$(echo $amend | cut -c-7)
 			amend=" ◃ "$C_$color[magenta]$_C$amend$C_$_prompt_colors[soft_generic]$_C
 		else
 			amend=""
-- 
cgit v1.2.3