From fce0499fad13815d936c1068b7a064030f543b3d Mon Sep 17 00:00:00 2001
From: Christian Couder <chriscool@tuxfamily.org>
Date: Tue, 20 Nov 2007 06:39:53 +0100
Subject: Bisect reset: do nothing when not bisecting.

Before this patch, using "git bisect reset" when not bisecting
did a "git checkout master" for no good reason.

This also happened using "git bisect replay" when not bisecting
because "bisect_replay" starts by calling "bisect_reset".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 git-bisect.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'git-bisect.sh')

diff --git a/git-bisect.sh b/git-bisect.sh
index 414f813be7..6f20a297a5 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -328,6 +328,10 @@ bisect_visualize() {
 }
 
 bisect_reset() {
+	test -f "$GIT_DIR/BISECT_NAMES" || {
+		echo "We are not bisecting."
+		return
+	}
 	case "$#" in
 	0) if [ -s "$GIT_DIR/head-name" ]; then
 	       branch=`cat "$GIT_DIR/head-name"`
-- 
cgit v1.2.1