[PATCH 2/3] bisect: improve error msg of 'bisect reset' when original HEAD is deleted

From: SZEDER Gábor <szeder@ira.uka.de>
Date: Oct 10, 2010, 21:48 UTC
Message-ID: <1286747338-8521-2-git-send-email-szeder@ira.uka.de>
In-Reply-To: <1286747338-8521-1-git-send-email-szeder@ira.uka.de>

'git bisect reset' (without the optional <commit> argument) returns to the original HEAD from where the bisection was started. However, when, for whatever reason, the user deleted the original HEAD before invoking 'git bisect reset', then all he gets is an error message from 'git checkout':

  fatal: invalid reference: somebranch

Let's try to be more helpful with an error message better describing what went wrong and a suggestion about how to resolve the situation:

  Could not check out original HEAD 'somebranch'. Try 'git bisect reset <commit>'.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 git-bisect.sh |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/git-bisect.sh b/git-bisect.sh
index 3a4bf81..68fcff6 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -316,7 +316,12 @@ bisect_reset() {
 	*)
 	    usage ;;
 	esac
-	git checkout "$branch" -- && bisect_clean_state
+	if git checkout "$branch" -- ; then
+		bisect_clean_state
+	else
+		die "Could not check out original HEAD '$branch'." \
+				"Try 'git bisect reset <commit>'."
+	fi
 }
 
 bisect_clean_state() {

-- 
1.7.3.1.148.g2fffa