Signed-off-by: Jon Seymour <jon.seymour@xxxxxxxxx> --- t/t6030-bisect-porcelain.sh | 69 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 2c14fb0..32fb434 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -624,4 +624,73 @@ test_expect_success 'bisect fails if tree is broken on trial commit' ' test_cmp expected.missing-tree.default error.txt ' +test_expect_success 'bisect: --ignore-checkout-failure - start commit bad' ' + git bisect reset && + git bisect start $BROKEN_HASH7 $HASH4 --ignore-checkout-failure 2>error.txt + test_cmp expected.missing-tree.ignored error.txt && + broken6=$(git rev-parse HEAD) && + test "$broken6" = "$BROKEN_HASH6" && + git bisect reset +' + +test_expect_success 'bisect: --ignore-checkout-failure - trial commit bad' ' + git bisect reset && + git bisect start broken $HASH4 --ignore-checkout-failure 2>error.txt + test_cmp expected.missing-tree.ignored error.txt && + broken6=$(git rev-parse HEAD) && + test "$broken6" = "$BROKEN_HASH6" && + git bisect reset +' + +test_expect_success 'bisect: --ignore-checkout-failure - target before breakage' ' + git bisect reset && + git bisect start broken $HASH4 --ignore-checkout-failure 2>error.txt + test_cmp expected.missing-tree.ignored error.txt && + broken6=$(git rev-parse HEAD) && + test "$broken6" = "$BROKEN_HASH6" && + git bisect bad HEAD && + broken5=$(git rev-parse HEAD) && + test "$broken5" = "$BROKEN_HASH5" && + git bisect bad HEAD > my_bisect_log.txt && + broken4=$(git rev-parse HEAD) && + test "$broken4" = "$HASH4" && + echo "$BROKEN_HASH5 is the first bad commit" > expected.txt && + test_cmp expected.txt my_bisect_log.txt + git bisect reset +' + +test_expect_success 'bisect: --ignore-checkout-failure - target in breakage' ' + git bisect reset && + git bisect start broken $HASH4 --ignore-checkout-failure 2>error.txt + test_cmp expected.missing-tree.ignored error.txt && + broken6=$(git rev-parse HEAD) && + test "$broken6" = "$BROKEN_HASH6" && + git bisect bad HEAD && + broken5=$(git rev-parse HEAD) && + test "$broken5" = "$BROKEN_HASH5" && + git bisect good HEAD > my_bisect_log.txt && + broken6=$(git rev-parse HEAD) && + test "$broken6" = "$BROKEN_HASH6" && + echo "$BROKEN_HASH6 is the first bad commit" > expected.txt && + test_cmp expected.txt my_bisect_log.txt + git bisect reset +' + +test_expect_success 'bisect: --ignore-checkout-failure - target after breakage' ' + git bisect reset && + git bisect start broken $HASH4 --ignore-checkout-failure 2>error.txt + test_cmp expected.missing-tree.ignored error.txt && + broken6=$(git rev-parse HEAD) && + test "$broken6" = "$BROKEN_HASH6" && + git bisect good HEAD && + broken8=$(git rev-parse HEAD) && + test "$broken8" = "$BROKEN_HASH8" && + git bisect good HEAD > my_bisect_log.txt && + broken9=$(git rev-parse HEAD) && + test "$broken9" = "$BROKEN_HASH9" && + echo "$BROKEN_HASH9 is the first bad commit" > expected.txt && + test_cmp expected.txt my_bisect_log.txt + git bisect reset +' + test_done -- 1.7.6.347.g96e0b.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html