diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 18e7998..ffd66b1 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -911,4 +911,12 @@ test_expect_success 'git bisect reset cleans bisection state properly' ' test_path_is_missing "$GIT_DIR/BISECT_START" ' +test_expect_success 'check whether bisection cleanup is not done with bad merge bases' ' + HEAD=$(git rev-parse --verify HEAD) && + git bisect start $HASH7 $SIDE_HASH7 && + test_expect_code 3 git bisect bad >out 2>out && + test_i18ngrep "The merge base " out && + test -e .git/BISECT_START && +' + test_done