bisect: fix left over "BISECT_START" file when starting with junk rev

Before this patch, when using for example:

$ git bisect start <stuff1> <stuff2>

with <stuff1> or <stuff2> that cannot be parsed as a revision, we
could leave a ".git/BISECT_START" file, from a previous
"git bisect start", alone.

This patch makes sure that it does not happen by removing the
"BISECT_START" file in "bisect_clean_state" and then always writing
it again at the end of "bisect_start".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-bisect.sh b/git-bisect.sh
index 164e8ed81fc3ecb5d33dafb9af0992761bfe513d..0dcb526f4ba240b1b303484cd4e989f5456d7fb0 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -81,8 +81,8 @@ bisect_start() {
        start_head=''
        case "$head" in
        refs/heads/bisect)
        start_head=''
        case "$head" in
        refs/heads/bisect)

-               branch=`cat "$GIT_DIR/BISECT_START"`
-               git checkout $branch || exit
+               start_head=$(cat "$GIT_DIR/BISECT_START")
+               git checkout "$start_head" || exit

                ;;
        refs/heads/*|$_x40)
                # This error message should only be triggered by cogito usage,
                ;;
        refs/heads/*|$_x40)
                # This error message should only be triggered by cogito usage,


@@ -134,7 +134,7 @@ bisect_start() {
        done
 
        sq "$@" >"$GIT_DIR/BISECT_NAMES"
        done
 
        sq "$@" >"$GIT_DIR/BISECT_NAMES"

-       test -n "$start_head" && echo "$start_head" >"$GIT_DIR/BISECT_START"
+       echo "$start_head" >"$GIT_DIR/BISECT_START"

        eval "$eval"
        echo "git-bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG"
        bisect_auto_next
        eval "$eval"
        echo "git-bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG"
        bisect_auto_next


@@ -392,12 +392,7 @@ bisect_reset() {
        *)
            usage ;;
        esac
        *)
            usage ;;
        esac

-       if git checkout "$branch"; then
-               # Cleanup head-name if it got left by an old version of git-bisect
-               rm -f "$GIT_DIR/head-name"
-               rm -f "$GIT_DIR/BISECT_START"
-               bisect_clean_state
-       fi
+       git checkout "$branch" && bisect_clean_state

 }
 
 bisect_clean_state() {
 }
 
 bisect_clean_state() {


@@ -407,9 +402,12 @@ bisect_clean_state() {
        do
                git update-ref -d $ref $hash
        done
        do
                git update-ref -d $ref $hash
        done

+       rm -f "$GIT_DIR/BISECT_START"

        rm -f "$GIT_DIR/BISECT_LOG"
        rm -f "$GIT_DIR/BISECT_NAMES"
        rm -f "$GIT_DIR/BISECT_RUN"
        rm -f "$GIT_DIR/BISECT_LOG"
        rm -f "$GIT_DIR/BISECT_NAMES"
        rm -f "$GIT_DIR/BISECT_RUN"

+       # Cleanup head-name if it got left by an old version of git-bisect
+       rm -f "$GIT_DIR/head-name"

 }
 
 bisect_replay () {
 }
 
 bisect_replay () {

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 7557fa1a1b2b6b0690eeaeb29bf255e018559896..68b5440917d2b23273f611f9f2caf52e4a60b62c 100755 (executable)
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -138,7 +138,7 @@ test_expect_success 'bisect start: back in good branch' '
        grep "* other" branch.output > /dev/null
 '
 
        grep "* other" branch.output > /dev/null
 '
 

-test_expect_failure 'bisect start: no ".git/BISECT_START" if junk rev' '
+test_expect_success 'bisect start: no ".git/BISECT_START" if junk rev' '

        git bisect start $HASH4 $HASH1 -- &&
        git bisect good &&
        test_must_fail git bisect start $HASH4 foo -- &&
        git bisect start $HASH4 $HASH1 -- &&
        git bisect good &&
        test_must_fail git bisect start $HASH4 foo -- &&