bisect: trap critical errors in "bisect_start"

Before this patch, when using "git bisect start" with mistaken revs
or when the checkout of the branch we want to test failed, we exited
after having written files like ".git/BISECT_START",
".git/BISECT_NAMES" and after having written "refs/bisect/bad" and
"refs/bisect/good-*" refs.

With this patch we trap all errors that can happen when writing the
new state and when we are in "bisect_next". So that we can try to
clean up everything in case of problems, using "bisect_clean_state".

This patch also contains a "bisect_write" cleanup to make it exit
on error and return 0 otherwise.

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 0dcb526f4ba240b1b303484cd4e989f5456d7fb0..57168b0ae43b07ec3c412e0c5bc19307a0770d95 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -133,11 +133,29 @@ bisect_start() {
            esac
        done
 
            esac
        done
 

-       sq "$@" >"$GIT_DIR/BISECT_NAMES"
-       echo "$start_head" >"$GIT_DIR/BISECT_START"
-       eval "$eval"
-       echo "git-bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG"
+       #
+       # Change state.
+       # In case of mistaken revs or checkout error, or signals received,
+       # "bisect_auto_next" below may exit or misbehave.
+       # We have to trap this to be able to clean up using
+       # "bisect_clean_state".
+       #
+       trap 'bisect_clean_state' 0
+       trap 'exit 255' 1 2 3 15
+
+       #
+       # Write new start state.
+       #
+       sq "$@" >"$GIT_DIR/BISECT_NAMES" &&
+       echo "$start_head" >"$GIT_DIR/BISECT_START" &&
+       eval "$eval" &&
+       echo "git-bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" || exit
+       #
+       # Check if we can proceed to the next bisect state.
+       #

        bisect_auto_next
        bisect_auto_next

+
+       trap '-' 0

 }
 
 bisect_write() {
 }
 
 bisect_write() {


@@ -149,9 +167,9 @@ bisect_write() {
                good|skip)      tag="$state"-"$rev" ;;
                *)              die "Bad bisect_write argument: $state" ;;
        esac
                good|skip)      tag="$state"-"$rev" ;;
                *)              die "Bad bisect_write argument: $state" ;;
        esac

-       git update-ref "refs/bisect/$tag" "$rev"
+       git update-ref "refs/bisect/$tag" "$rev" || exit

        echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG"
        echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG"

-       test -z "$nolog" && echo "git-bisect $state $rev" >>"$GIT_DIR/BISECT_LOG"
+       test -n "$nolog" || echo "git-bisect $state $rev" >>"$GIT_DIR/BISECT_LOG"

 }
 
 bisect_state() {
 }
 
 bisect_state() {

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 68b5440917d2b23273f611f9f2caf52e4a60b62c..c4f074d738a78030effd9b38aa4fe409f03bb808 100755 (executable)
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -147,7 +147,7 @@ test_expect_success 'bisect start: no ".git/BISECT_START" if junk rev' '
        test_must_fail test -e .git/BISECT_START
 '
 
        test_must_fail test -e .git/BISECT_START
 '
 

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

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


@@ -156,19 +156,17 @@ test_expect_failure 'bisect start: no ".git/BISECT_START" if mistaken rev' '
        test_must_fail test -e .git/BISECT_START
 '
 
        test_must_fail test -e .git/BISECT_START
 '
 

-test_expect_failure 'bisect start: no ".git/BISECT_START" if checkout error' '
+test_expect_success 'bisect start: no ".git/BISECT_START" if checkout error' '

        echo "temp stuff" > hello &&
        test_must_fail git bisect start $HASH4 $HASH1 -- &&
        git branch &&
        git branch > branch.output &&
        grep "* other" branch.output > /dev/null &&
        test_must_fail test -e .git/BISECT_START &&
        echo "temp stuff" > hello &&
        test_must_fail git bisect start $HASH4 $HASH1 -- &&
        git branch &&
        git branch > branch.output &&
        grep "* other" branch.output > /dev/null &&
        test_must_fail test -e .git/BISECT_START &&

-       test -z "$(git for-each-ref "refs/bisect/*")"
+       test -z "$(git for-each-ref "refs/bisect/*")" &&
+       git checkout HEAD hello

 '
 
 '
 

-# This cleanup is needed whatever the result of the above test.
-git checkout HEAD hello
-

 # $HASH1 is good, $HASH4 is bad, we skip $HASH3
 # but $HASH2 is bad,
 # so we should find $HASH2 as the first bad commit
 # $HASH1 is good, $HASH4 is bad, we skip $HASH3
 # but $HASH2 is bad,
 # so we should find $HASH2 as the first bad commit