From: Christian Couder <chriscool@tuxfamily.org>
Date: Thu, 29 Mar 2007 07:42:35 +0000 (+0200)
Subject: Bisect: Improve error message in "bisect_next_check".
X-Git-Tag: v1.5.1~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6f01e6b37008e45efb2b17a027f045600a011e93;p=git.git

Bisect: Improve error message in "bisect_next_check".

So we can remove the specific message in "bisect_run".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-bisect.sh b/git-bisect.sh
index 57d6754d3..11313a794 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -123,7 +123,15 @@ bisect_next_check() {
 	case "$next_ok,$1" in
 	no,) false ;;
 	no,fail)
-	    echo >&2 'You need to give me at least one good and one bad revisions.'
+	    THEN=''
+	    test -d "$GIT_DIR/refs/bisect" || {
+		echo >&2 'You need to start by "git bisect start".'
+		THEN='then '
+	    }
+	    echo >&2 'You '$THEN'need to give me at least one good' \
+		'and one bad revisions.'
+	    echo >&2 '(You can use "git bisect bad" and' \
+		'"git bisect good" for that.)'
 	    exit 1 ;;
 	*)
 	    true ;;
@@ -223,12 +231,6 @@ bisect_replay () {
 }
 
 bisect_run () {
-    # Check that we have everything to run correctly.
-    test -d "$GIT_DIR/refs/bisect" || {
-	echo >&2 'You need to start by "git bisect start".'
-	echo >&2 'And then by "git bisect bad" and "git bisect good".'
-	exit 1
-    }
     bisect_next_check fail
 
     while true