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 57d6754d34cf711804c7d0189a55a18e47ba5b8a..11313a7949909f61f47ccc061cfc6390b225c630 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -123,7 +123,15 @@ bisect_next_check() {
        case "$next_ok,$1" in
        no,) false ;;
        no,fail)
        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 ;;
            exit 1 ;;
        *)
            true ;;


@@ -223,12 +231,6 @@ bisect_replay () {
 }
 
 bisect_run () {
 }
 
 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
     bisect_next_check fail
 
     while true