about summary refs log tree commit diff
path: root/third_party/git/t/t6030-bisect-porcelain.sh
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/t/t6030-bisect-porcelain.sh')
-rwxr-xr-xthird_party/git/t/t6030-bisect-porcelain.sh939
1 files changed, 0 insertions, 939 deletions
diff --git a/third_party/git/t/t6030-bisect-porcelain.sh b/third_party/git/t/t6030-bisect-porcelain.sh
deleted file mode 100755
index aa226381be21..000000000000
--- a/third_party/git/t/t6030-bisect-porcelain.sh
+++ /dev/null
@@ -1,939 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2007 Christian Couder
-#
-test_description='Tests git bisect functionality'
-
-exec </dev/null
-
-. ./test-lib.sh
-
-add_line_into_file()
-{
-    _line=$1
-    _file=$2
-
-    if [ -f "$_file" ]; then
-        echo "$_line" >> $_file || return $?
-        MSG="Add <$_line> into <$_file>."
-    else
-        echo "$_line" > $_file || return $?
-        git add $_file || return $?
-        MSG="Create file <$_file> with <$_line> inside."
-    fi
-
-    test_tick
-    git commit --quiet -m "$MSG" $_file
-}
-
-HASH1=
-HASH2=
-HASH3=
-HASH4=
-
-test_expect_success 'set up basic repo with 1 file (hello) and 4 commits' '
-     add_line_into_file "1: Hello World" hello &&
-     HASH1=$(git rev-parse --verify HEAD) &&
-     add_line_into_file "2: A new day for git" hello &&
-     HASH2=$(git rev-parse --verify HEAD) &&
-     add_line_into_file "3: Another new day for git" hello &&
-     HASH3=$(git rev-parse --verify HEAD) &&
-     add_line_into_file "4: Ciao for now" hello &&
-     HASH4=$(git rev-parse --verify HEAD)
-'
-
-test_expect_success 'bisect starts with only one bad' '
-	git bisect reset &&
-	git bisect start &&
-	git bisect bad $HASH4 &&
-	git bisect next
-'
-
-test_expect_success 'bisect does not start with only one good' '
-	git bisect reset &&
-	git bisect start &&
-	git bisect good $HASH1 &&
-	test_must_fail git bisect next
-'
-
-test_expect_success 'bisect start with one bad and good' '
-	git bisect reset &&
-	git bisect start &&
-	git bisect good $HASH1 &&
-	git bisect bad $HASH4 &&
-	git bisect next
-'
-
-test_expect_success 'bisect fails if given any junk instead of revs' '
-	git bisect reset &&
-	test_must_fail git bisect start foo $HASH1 -- &&
-	test_must_fail git bisect start $HASH4 $HASH1 bar -- &&
-	test -z "$(git for-each-ref "refs/bisect/*")" &&
-	test -z "$(ls .git/BISECT_* 2>/dev/null)" &&
-	git bisect start &&
-	test_must_fail git bisect good foo $HASH1 &&
-	test_must_fail git bisect good $HASH1 bar &&
-	test_must_fail git bisect bad frotz &&
-	test_must_fail git bisect bad $HASH3 $HASH4 &&
-	test_must_fail git bisect skip bar $HASH3 &&
-	test_must_fail git bisect skip $HASH1 foo &&
-	test -z "$(git for-each-ref "refs/bisect/*")" &&
-	git bisect good $HASH1 &&
-	git bisect bad $HASH4
-'
-
-test_expect_success 'bisect start without -- takes unknown arg as pathspec' '
-	git bisect reset &&
-	git bisect start foo bar &&
-	grep foo ".git/BISECT_NAMES" &&
-	grep bar ".git/BISECT_NAMES"
-'
-
-test_expect_success 'bisect reset: back in the master branch' '
-	git bisect reset &&
-	echo "* master" > branch.expect &&
-	git branch > branch.output &&
-	cmp branch.expect branch.output
-'
-
-test_expect_success 'bisect reset: back in another branch' '
-	git checkout -b other &&
-	git bisect start &&
-	git bisect good $HASH1 &&
-	git bisect bad $HASH3 &&
-	git bisect reset &&
-	echo "  master" > branch.expect &&
-	echo "* other" >> branch.expect &&
-	git branch > branch.output &&
-	cmp branch.expect branch.output
-'
-
-test_expect_success 'bisect reset when not bisecting' '
-	git bisect reset &&
-	git branch > branch.output &&
-	cmp branch.expect branch.output
-'
-
-test_expect_success 'bisect reset removes packed refs' '
-	git bisect reset &&
-	git bisect start &&
-	git bisect good $HASH1 &&
-	git bisect bad $HASH3 &&
-	git pack-refs --all --prune &&
-	git bisect next &&
-	git bisect reset &&
-	test -z "$(git for-each-ref "refs/bisect/*")" &&
-	test -z "$(git for-each-ref "refs/heads/bisect")"
-'
-
-test_expect_success 'bisect reset removes bisect state after --no-checkout' '
-	git bisect reset &&
-	git bisect start --no-checkout &&
-	git bisect good $HASH1 &&
-	git bisect bad $HASH3 &&
-	git bisect next &&
-	git bisect reset &&
-	test -z "$(git for-each-ref "refs/bisect/*")" &&
-	test -z "$(git for-each-ref "refs/heads/bisect")" &&
-	test -z "$(git for-each-ref "BISECT_HEAD")"
-'
-
-test_expect_success 'bisect start: back in good branch' '
-	git branch > branch.output &&
-	grep "* other" branch.output > /dev/null &&
-	git bisect start $HASH4 $HASH1 -- &&
-	git bisect good &&
-	git bisect start $HASH4 $HASH1 -- &&
-	git bisect bad &&
-	git bisect reset &&
-	git branch > branch.output &&
-	grep "* other" branch.output > /dev/null
-'
-
-test_expect_success 'bisect start: no ".git/BISECT_START" created if junk rev' '
-	git bisect reset &&
-	test_must_fail git bisect start $HASH4 foo -- &&
-	git branch > branch.output &&
-	grep "* other" branch.output > /dev/null &&
-	test_path_is_missing .git/BISECT_START
-'
-
-test_expect_success 'bisect start: existing ".git/BISECT_START" not modified if junk rev' '
-	git bisect start $HASH4 $HASH1 -- &&
-	git bisect good &&
-	cp .git/BISECT_START saved &&
-	test_must_fail git bisect start $HASH4 foo -- &&
-	git branch > branch.output &&
-	test_i18ngrep "* (no branch, bisect started on other)" branch.output > /dev/null &&
-	test_cmp saved .git/BISECT_START
-'
-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 branch > branch.output &&
-	grep "* other" branch.output > /dev/null &&
-	test_path_is_missing .git/BISECT_START
-'
-
-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_path_is_missing .git/BISECT_START &&
-	test -z "$(git for-each-ref "refs/bisect/*")" &&
-	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
-test_expect_success 'bisect skip: successful result' '
-	test_when_finished git bisect reset &&
-	git bisect reset &&
-	git bisect start $HASH4 $HASH1 &&
-	git bisect skip &&
-	git bisect bad > my_bisect_log.txt &&
-	grep "$HASH2 is the first bad commit" my_bisect_log.txt
-'
-
-# $HASH1 is good, $HASH4 is bad, we skip $HASH3 and $HASH2
-# so we should not be able to tell the first bad commit
-# among $HASH2, $HASH3 and $HASH4
-test_expect_success 'bisect skip: cannot tell between 3 commits' '
-	test_when_finished git bisect reset &&
-	git bisect start $HASH4 $HASH1 &&
-	git bisect skip &&
-	test_expect_code 2 git bisect skip >my_bisect_log.txt &&
-	grep "first bad commit could be any of" my_bisect_log.txt &&
-	! grep $HASH1 my_bisect_log.txt &&
-	grep $HASH2 my_bisect_log.txt &&
-	grep $HASH3 my_bisect_log.txt &&
-	grep $HASH4 my_bisect_log.txt
-'
-
-# $HASH1 is good, $HASH4 is bad, we skip $HASH3
-# but $HASH2 is good,
-# so we should not be able to tell the first bad commit
-# among $HASH3 and $HASH4
-test_expect_success 'bisect skip: cannot tell between 2 commits' '
-	test_when_finished git bisect reset &&
-	git bisect start $HASH4 $HASH1 &&
-	git bisect skip &&
-	test_expect_code 2 git bisect good >my_bisect_log.txt &&
-	grep "first bad commit could be any of" my_bisect_log.txt &&
-	! grep $HASH1 my_bisect_log.txt &&
-	! grep $HASH2 my_bisect_log.txt &&
-	grep $HASH3 my_bisect_log.txt &&
-	grep $HASH4 my_bisect_log.txt
-'
-
-# $HASH1 is good, $HASH4 is both skipped and bad, we skip $HASH3
-# and $HASH2 is good,
-# so we should not be able to tell the first bad commit
-# among $HASH3 and $HASH4
-test_expect_success 'bisect skip: with commit both bad and skipped' '
-	test_when_finished git bisect reset &&
-	git bisect start &&
-	git bisect skip &&
-	git bisect bad &&
-	git bisect good $HASH1 &&
-	git bisect skip &&
-	test_expect_code 2 git bisect good >my_bisect_log.txt &&
-	grep "first bad commit could be any of" my_bisect_log.txt &&
-	! grep $HASH1 my_bisect_log.txt &&
-	! grep $HASH2 my_bisect_log.txt &&
-	grep $HASH3 my_bisect_log.txt &&
-	grep $HASH4 my_bisect_log.txt
-'
-
-# We want to automatically find the commit that
-# added "Another" into hello.
-test_expect_success '"git bisect run" simple case' '
-	write_script test_script.sh <<-\EOF &&
-	! grep Another hello >/dev/null
-	EOF
-	git bisect start &&
-	git bisect good $HASH1 &&
-	git bisect bad $HASH4 &&
-	git bisect run ./test_script.sh >my_bisect_log.txt &&
-	grep "$HASH3 is the first bad commit" my_bisect_log.txt &&
-	git bisect reset
-'
-
-# We want to automatically find the commit that
-# added "Ciao" into hello.
-test_expect_success '"git bisect run" with more complex "git bisect start"' '
-	write_script test_script.sh <<-\EOF &&
-	! grep Ciao hello >/dev/null
-	EOF
-	git bisect start $HASH4 $HASH1 &&
-	git bisect run ./test_script.sh >my_bisect_log.txt &&
-	grep "$HASH4 is the first bad commit" my_bisect_log.txt &&
-	git bisect reset
-'
-
-# $HASH1 is good, $HASH5 is bad, we skip $HASH3
-# but $HASH4 is good,
-# so we should find $HASH5 as the first bad commit
-HASH5=
-test_expect_success 'bisect skip: add line and then a new test' '
-	add_line_into_file "5: Another new line." hello &&
-	HASH5=$(git rev-parse --verify HEAD) &&
-	git bisect start $HASH5 $HASH1 &&
-	git bisect skip &&
-	git bisect good > my_bisect_log.txt &&
-	grep "$HASH5 is the first bad commit" my_bisect_log.txt &&
-	git bisect log > log_to_replay.txt &&
-	git bisect reset
-'
-
-test_expect_success 'bisect skip and bisect replay' '
-	git bisect replay log_to_replay.txt > my_bisect_log.txt &&
-	grep "$HASH5 is the first bad commit" my_bisect_log.txt &&
-	git bisect reset
-'
-
-HASH6=
-test_expect_success 'bisect run & skip: cannot tell between 2' '
-	add_line_into_file "6: Yet a line." hello &&
-	HASH6=$(git rev-parse --verify HEAD) &&
-	write_script test_script.sh <<-\EOF &&
-	sed -ne \$p hello | grep Ciao >/dev/null && exit 125
-	! grep line hello >/dev/null
-	EOF
-	git bisect start $HASH6 $HASH1 &&
-	test_expect_code 2 git bisect run ./test_script.sh >my_bisect_log.txt &&
-	grep "first bad commit could be any of" my_bisect_log.txt &&
-	! grep $HASH3 my_bisect_log.txt &&
-	! grep $HASH6 my_bisect_log.txt &&
-	grep $HASH4 my_bisect_log.txt &&
-	grep $HASH5 my_bisect_log.txt
-'
-
-HASH7=
-test_expect_success 'bisect run & skip: find first bad' '
-	git bisect reset &&
-	add_line_into_file "7: Should be the last line." hello &&
-	HASH7=$(git rev-parse --verify HEAD) &&
-	write_script test_script.sh <<-\EOF &&
-	sed -ne \$p hello | grep Ciao >/dev/null && exit 125
-	sed -ne \$p hello | grep day >/dev/null && exit 125
-	! grep Yet hello >/dev/null
-	EOF
-	git bisect start $HASH7 $HASH1 &&
-	git bisect run ./test_script.sh >my_bisect_log.txt &&
-	grep "$HASH6 is the first bad commit" my_bisect_log.txt
-'
-
-test_expect_success 'bisect skip only one range' '
-	git bisect reset &&
-	git bisect start $HASH7 $HASH1 &&
-	git bisect skip $HASH1..$HASH5 &&
-	test "$HASH6" = "$(git rev-parse --verify HEAD)" &&
-	test_must_fail git bisect bad > my_bisect_log.txt &&
-	grep "first bad commit could be any of" my_bisect_log.txt
-'
-
-test_expect_success 'bisect skip many ranges' '
-	git bisect start $HASH7 $HASH1 &&
-	test "$HASH4" = "$(git rev-parse --verify HEAD)" &&
-	git bisect skip $HASH2 $HASH2.. ..$HASH5 &&
-	test "$HASH6" = "$(git rev-parse --verify HEAD)" &&
-	test_must_fail git bisect bad > my_bisect_log.txt &&
-	grep "first bad commit could be any of" my_bisect_log.txt
-'
-
-test_expect_success 'bisect starting with a detached HEAD' '
-	git bisect reset &&
-	git checkout master^ &&
-	HEAD=$(git rev-parse --verify HEAD) &&
-	git bisect start &&
-	test $HEAD = $(cat .git/BISECT_START) &&
-	git bisect reset &&
-	test $HEAD = $(git rev-parse --verify HEAD)
-'
-
-test_expect_success 'bisect errors out if bad and good are mistaken' '
-	git bisect reset &&
-	test_must_fail git bisect start $HASH2 $HASH4 2> rev_list_error &&
-	test_i18ngrep "mistook good and bad" rev_list_error &&
-	git bisect reset
-'
-
-test_expect_success 'bisect does not create a "bisect" branch' '
-	git bisect reset &&
-	git bisect start $HASH7 $HASH1 &&
-	git branch bisect &&
-	rev_hash4=$(git rev-parse --verify HEAD) &&
-	test "$rev_hash4" = "$HASH4" &&
-	git branch -D bisect &&
-	git bisect good &&
-	git branch bisect &&
-	rev_hash6=$(git rev-parse --verify HEAD) &&
-	test "$rev_hash6" = "$HASH6" &&
-	git bisect good > my_bisect_log.txt &&
-	grep "$HASH7 is the first bad commit" my_bisect_log.txt &&
-	git bisect reset &&
-	rev_hash6=$(git rev-parse --verify bisect) &&
-	test "$rev_hash6" = "$HASH6" &&
-	git branch -D bisect
-'
-
-# This creates a "side" branch to test "siblings" cases.
-#
-# H1-H2-H3-H4-H5-H6-H7  <--other
-#            \
-#             S5-S6-S7  <--side
-#
-test_expect_success 'side branch creation' '
-	git bisect reset &&
-	git checkout -b side $HASH4 &&
-	add_line_into_file "5(side): first line on a side branch" hello2 &&
-	SIDE_HASH5=$(git rev-parse --verify HEAD) &&
-	add_line_into_file "6(side): second line on a side branch" hello2 &&
-	SIDE_HASH6=$(git rev-parse --verify HEAD) &&
-	add_line_into_file "7(side): third line on a side branch" hello2 &&
-	SIDE_HASH7=$(git rev-parse --verify HEAD)
-'
-
-test_expect_success 'good merge base when good and bad are siblings' '
-	git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt &&
-	test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
-	grep $HASH4 my_bisect_log.txt &&
-	git bisect good > my_bisect_log.txt &&
-	! grep "merge base must be tested" my_bisect_log.txt &&
-	grep $HASH6 my_bisect_log.txt &&
-	git bisect reset
-'
-test_expect_success 'skipped merge base when good and bad are siblings' '
-	git bisect start "$SIDE_HASH7" "$HASH7" > my_bisect_log.txt &&
-	test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
-	grep $HASH4 my_bisect_log.txt &&
-	git bisect skip > my_bisect_log.txt 2>&1 &&
-	grep "warning" my_bisect_log.txt &&
-	grep $SIDE_HASH6 my_bisect_log.txt &&
-	git bisect reset
-'
-
-test_expect_success 'bad merge base when good and bad are siblings' '
-	git bisect start "$HASH7" HEAD > my_bisect_log.txt &&
-	test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
-	grep $HASH4 my_bisect_log.txt &&
-	test_must_fail git bisect bad > my_bisect_log.txt 2>&1 &&
-	test_i18ngrep "merge base $HASH4 is bad" my_bisect_log.txt &&
-	test_i18ngrep "fixed between $HASH4 and \[$SIDE_HASH7\]" my_bisect_log.txt &&
-	git bisect reset
-'
-
-# This creates a few more commits (A and B) to test "siblings" cases
-# when a good and a bad rev have many merge bases.
-#
-# We should have the following:
-#
-# H1-H2-H3-H4-H5-H6-H7
-#            \  \     \
-#             S5-A     \
-#              \        \
-#               S6-S7----B
-#
-# And there A and B have 2 merge bases (S5 and H5) that should be
-# reported by "git merge-base --all A B".
-#
-test_expect_success 'many merge bases creation' '
-	git checkout "$SIDE_HASH5" &&
-	git merge -m "merge HASH5 and SIDE_HASH5" "$HASH5" &&
-	A_HASH=$(git rev-parse --verify HEAD) &&
-	git checkout side &&
-	git merge -m "merge HASH7 and SIDE_HASH7" "$HASH7" &&
-	B_HASH=$(git rev-parse --verify HEAD) &&
-	git merge-base --all "$A_HASH" "$B_HASH" > merge_bases.txt &&
-	test_line_count = 2 merge_bases.txt &&
-	grep "$HASH5" merge_bases.txt &&
-	grep "$SIDE_HASH5" merge_bases.txt
-'
-
-# We want to automatically find the merge that
-# added "line" into hello.
-test_expect_success '"git bisect run --first-parent" simple case' '
-	git rev-list --first-parent $B_HASH ^$HASH4 >first_parent_chain.txt &&
-	write_script test_script.sh <<-\EOF &&
-	grep $(git rev-parse HEAD) first_parent_chain.txt || exit -1
-	! grep line hello >/dev/null
-	EOF
-	git bisect start --first-parent &&
-	test_path_is_file ".git/BISECT_FIRST_PARENT" &&
-	git bisect good $HASH4 &&
-	git bisect bad $B_HASH &&
-	git bisect run ./test_script.sh >my_bisect_log.txt &&
-	grep "$B_HASH is the first bad commit" my_bisect_log.txt &&
-	git bisect reset &&
-	test_path_is_missing .git/BISECT_FIRST_PARENT
-'
-
-test_expect_success 'good merge bases when good and bad are siblings' '
-	git bisect start "$B_HASH" "$A_HASH" > my_bisect_log.txt &&
-	test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
-	git bisect good > my_bisect_log2.txt &&
-	test_i18ngrep "merge base must be tested" my_bisect_log2.txt &&
-	{
-		{
-			grep "$SIDE_HASH5" my_bisect_log.txt &&
-			grep "$HASH5" my_bisect_log2.txt
-		} || {
-			grep "$SIDE_HASH5" my_bisect_log2.txt &&
-			grep "$HASH5" my_bisect_log.txt
-		}
-	} &&
-	git bisect reset
-'
-
-test_expect_success 'optimized merge base checks' '
-	git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt &&
-	test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
-	grep "$HASH4" my_bisect_log.txt &&
-	git bisect good > my_bisect_log2.txt &&
-	test -f ".git/BISECT_ANCESTORS_OK" &&
-	test "$HASH6" = $(git rev-parse --verify HEAD) &&
-	git bisect bad &&
-	git bisect good "$A_HASH" > my_bisect_log4.txt &&
-	test_i18ngrep "merge base must be tested" my_bisect_log4.txt &&
-	test_path_is_missing ".git/BISECT_ANCESTORS_OK"
-'
-
-# This creates another side branch called "parallel" with some files
-# in some directories, to test bisecting with paths.
-#
-# We should have the following:
-#
-#    P1-P2-P3-P4-P5-P6-P7
-#   /        /        /
-# H1-H2-H3-H4-H5-H6-H7
-#            \  \     \
-#             S5-A     \
-#              \        \
-#               S6-S7----B
-#
-test_expect_success '"parallel" side branch creation' '
-	git bisect reset &&
-	git checkout -b parallel $HASH1 &&
-	mkdir dir1 dir2 &&
-	add_line_into_file "1(para): line 1 on parallel branch" dir1/file1 &&
-	PARA_HASH1=$(git rev-parse --verify HEAD) &&
-	add_line_into_file "2(para): line 2 on parallel branch" dir2/file2 &&
-	PARA_HASH2=$(git rev-parse --verify HEAD) &&
-	add_line_into_file "3(para): line 3 on parallel branch" dir2/file3 &&
-	PARA_HASH3=$(git rev-parse --verify HEAD) &&
-	git merge -m "merge HASH4 and PARA_HASH3" "$HASH4" &&
-	PARA_HASH4=$(git rev-parse --verify HEAD) &&
-	add_line_into_file "5(para): add line on parallel branch" dir1/file1 &&
-	PARA_HASH5=$(git rev-parse --verify HEAD) &&
-	add_line_into_file "6(para): add line on parallel branch" dir2/file2 &&
-	PARA_HASH6=$(git rev-parse --verify HEAD) &&
-	git merge -m "merge HASH7 and PARA_HASH6" "$HASH7" &&
-	PARA_HASH7=$(git rev-parse --verify HEAD)
-'
-
-test_expect_success 'restricting bisection on one dir' '
-	git bisect reset &&
-	git bisect start HEAD $HASH1 -- dir1 &&
-	para1=$(git rev-parse --verify HEAD) &&
-	test "$para1" = "$PARA_HASH1" &&
-	git bisect bad > my_bisect_log.txt &&
-	grep "$PARA_HASH1 is the first bad commit" my_bisect_log.txt
-'
-
-test_expect_success 'restricting bisection on one dir and a file' '
-	git bisect reset &&
-	git bisect start HEAD $HASH1 -- dir1 hello &&
-	para4=$(git rev-parse --verify HEAD) &&
-	test "$para4" = "$PARA_HASH4" &&
-	git bisect bad &&
-	hash3=$(git rev-parse --verify HEAD) &&
-	test "$hash3" = "$HASH3" &&
-	git bisect good &&
-	hash4=$(git rev-parse --verify HEAD) &&
-	test "$hash4" = "$HASH4" &&
-	git bisect good &&
-	para1=$(git rev-parse --verify HEAD) &&
-	test "$para1" = "$PARA_HASH1" &&
-	git bisect good > my_bisect_log.txt &&
-	grep "$PARA_HASH4 is the first bad commit" my_bisect_log.txt
-'
-
-test_expect_success 'skipping away from skipped commit' '
-	git bisect start $PARA_HASH7 $HASH1 &&
-	para4=$(git rev-parse --verify HEAD) &&
-	test "$para4" = "$PARA_HASH4" &&
-        git bisect skip &&
-	hash7=$(git rev-parse --verify HEAD) &&
-	test "$hash7" = "$HASH7" &&
-        git bisect skip &&
-	para3=$(git rev-parse --verify HEAD) &&
-	test "$para3" = "$PARA_HASH3"
-'
-
-test_expect_success 'erroring out when using bad path parameters' '
-	test_must_fail git bisect start $PARA_HASH7 $HASH1 -- foobar 2> error.txt &&
-	test_i18ngrep "bad path parameters" error.txt
-'
-
-test_expect_success 'test bisection on bare repo - --no-checkout specified' '
-	git clone --bare . bare.nocheckout &&
-	(
-		cd bare.nocheckout &&
-		git bisect start --no-checkout &&
-		git bisect good $HASH1 &&
-		git bisect bad $HASH4 &&
-		git bisect run eval \
-			"test \$(git rev-list BISECT_HEAD ^$HASH2 --max-count=1 | wc -l) = 0" \
-			>../nocheckout.log
-	) &&
-	grep "$HASH3 is the first bad commit" nocheckout.log
-'
-
-
-test_expect_success 'test bisection on bare repo - --no-checkout defaulted' '
-	git clone --bare . bare.defaulted &&
-	(
-		cd bare.defaulted &&
-		git bisect start &&
-		git bisect good $HASH1 &&
-		git bisect bad $HASH4 &&
-		git bisect run eval \
-			"test \$(git rev-list BISECT_HEAD ^$HASH2 --max-count=1 | wc -l) = 0" \
-			>../defaulted.log
-	) &&
-	grep "$HASH3 is the first bad commit" defaulted.log
-'
-
-#
-# This creates a broken branch which cannot be checked out because
-# the tree created has been deleted.
-#
-# H1-H2-H3-H4-H5-H6-H7  <--other
-#            \
-#             S5-S6'-S7'-S8'-S9  <--broken
-#
-# Commits marked with ' have a missing tree.
-#
-test_expect_success 'broken branch creation' '
-	git bisect reset &&
-	git checkout -b broken $HASH4 &&
-	git tag BROKEN_HASH4 $HASH4 &&
-	add_line_into_file "5(broken): first line on a broken branch" hello2 &&
-	git tag BROKEN_HASH5 &&
-	mkdir missing &&
-	:> missing/MISSING &&
-	git add missing/MISSING &&
-	git commit -m "6(broken): Added file that will be deleted" &&
-	git tag BROKEN_HASH6 &&
-	deleted=$(git rev-parse --verify HEAD:missing) &&
-	add_line_into_file "7(broken): second line on a broken branch" hello2 &&
-	git tag BROKEN_HASH7 &&
-	add_line_into_file "8(broken): third line on a broken branch" hello2 &&
-	git tag BROKEN_HASH8 &&
-	git rm missing/MISSING &&
-	git commit -m "9(broken): Remove missing file" &&
-	git tag BROKEN_HASH9 &&
-	rm .git/objects/$(test_oid_to_path $deleted)
-'
-
-echo "" > expected.ok
-cat > expected.missing-tree.default <<EOF
-fatal: unable to read tree $deleted
-EOF
-
-test_expect_success 'bisect fails if tree is broken on start commit' '
-	git bisect reset &&
-	test_must_fail git bisect start BROKEN_HASH7 BROKEN_HASH4 2>error.txt &&
-	test_cmp expected.missing-tree.default error.txt
-'
-
-test_expect_success 'bisect fails if tree is broken on trial commit' '
-	git bisect reset &&
-	test_must_fail git bisect start BROKEN_HASH9 BROKEN_HASH4 2>error.txt &&
-	git reset --hard broken &&
-	git checkout broken &&
-	test_cmp expected.missing-tree.default error.txt
-'
-
-check_same()
-{
-	echo "Checking $1 is the same as $2" &&
-	test_cmp_rev "$1" "$2"
-}
-
-test_expect_success 'bisect: --no-checkout - start commit bad' '
-	git bisect reset &&
-	git bisect start BROKEN_HASH7 BROKEN_HASH4 --no-checkout &&
-	check_same BROKEN_HASH6 BISECT_HEAD &&
-	git bisect reset
-'
-
-test_expect_success 'bisect: --no-checkout - trial commit bad' '
-	git bisect reset &&
-	git bisect start broken BROKEN_HASH4 --no-checkout &&
-	check_same BROKEN_HASH6 BISECT_HEAD &&
-	git bisect reset
-'
-
-test_expect_success 'bisect: --no-checkout - target before breakage' '
-	git bisect reset &&
-	git bisect start broken BROKEN_HASH4 --no-checkout &&
-	check_same BROKEN_HASH6 BISECT_HEAD &&
-	git bisect bad BISECT_HEAD &&
-	check_same BROKEN_HASH5 BISECT_HEAD &&
-	git bisect bad BISECT_HEAD &&
-	check_same BROKEN_HASH5 bisect/bad &&
-	git bisect reset
-'
-
-test_expect_success 'bisect: --no-checkout - target in breakage' '
-	git bisect reset &&
-	git bisect start broken BROKEN_HASH4 --no-checkout &&
-	check_same BROKEN_HASH6 BISECT_HEAD &&
-	git bisect bad BISECT_HEAD &&
-	check_same BROKEN_HASH5 BISECT_HEAD &&
-	test_must_fail git bisect good BISECT_HEAD &&
-	check_same BROKEN_HASH6 bisect/bad &&
-	git bisect reset
-'
-
-test_expect_success 'bisect: --no-checkout - target after breakage' '
-	git bisect reset &&
-	git bisect start broken BROKEN_HASH4 --no-checkout &&
-	check_same BROKEN_HASH6 BISECT_HEAD &&
-	git bisect good BISECT_HEAD &&
-	check_same BROKEN_HASH8 BISECT_HEAD &&
-	test_must_fail git bisect good BISECT_HEAD &&
-	check_same BROKEN_HASH9 bisect/bad &&
-	git bisect reset
-'
-
-test_expect_success 'bisect: demonstrate identification of damage boundary' "
-	git bisect reset &&
-	git checkout broken &&
-	git bisect start broken master --no-checkout &&
-	test_must_fail git bisect run \"\$SHELL_PATH\" -c '
-		GOOD=\$(git for-each-ref \"--format=%(objectname)\" refs/bisect/good-*) &&
-		git rev-list --objects BISECT_HEAD --not \$GOOD >tmp.\$\$ &&
-		git pack-objects --stdout >/dev/null < tmp.\$\$
-		rc=\$?
-		rm -f tmp.\$\$
-		test \$rc = 0' &&
-	check_same BROKEN_HASH6 bisect/bad &&
-	git bisect reset
-"
-
-cat > expected.bisect-log <<EOF
-# bad: [$HASH4] Add <4: Ciao for now> into <hello>.
-# good: [$HASH2] Add <2: A new day for git> into <hello>.
-git bisect start '$HASH4' '$HASH2'
-# good: [$HASH3] Add <3: Another new day for git> into <hello>.
-git bisect good $HASH3
-# first bad commit: [$HASH4] Add <4: Ciao for now> into <hello>.
-EOF
-
-test_expect_success 'bisect log: successful result' '
-	git bisect reset &&
-	git bisect start $HASH4 $HASH2 &&
-	git bisect good &&
-	git bisect log >bisect-log.txt &&
-	test_cmp expected.bisect-log bisect-log.txt &&
-	git bisect reset
-'
-
-cat > expected.bisect-skip-log <<EOF
-# bad: [$HASH4] Add <4: Ciao for now> into <hello>.
-# good: [$HASH2] Add <2: A new day for git> into <hello>.
-git bisect start '$HASH4' '$HASH2'
-# skip: [$HASH3] Add <3: Another new day for git> into <hello>.
-git bisect skip $HASH3
-# only skipped commits left to test
-# possible first bad commit: [$HASH4] Add <4: Ciao for now> into <hello>.
-# possible first bad commit: [$HASH3] Add <3: Another new day for git> into <hello>.
-EOF
-
-test_expect_success 'bisect log: only skip commits left' '
-	git bisect reset &&
-	git bisect start $HASH4 $HASH2 &&
-	test_must_fail git bisect skip &&
-	git bisect log >bisect-skip-log.txt &&
-	test_cmp expected.bisect-skip-log bisect-skip-log.txt &&
-	git bisect reset
-'
-
-test_expect_success '"git bisect bad HEAD" behaves as "git bisect bad"' '
-	git checkout parallel &&
-	git bisect start HEAD $HASH1 &&
-	git bisect good HEAD &&
-	git bisect bad HEAD &&
-	test "$HASH6" = $(git rev-parse --verify HEAD) &&
-	git bisect reset
-'
-
-test_expect_success 'bisect starts with only one new' '
-	git bisect reset &&
-	git bisect start &&
-	git bisect new $HASH4 &&
-	git bisect next
-'
-
-test_expect_success 'bisect does not start with only one old' '
-	git bisect reset &&
-	git bisect start &&
-	git bisect old $HASH1 &&
-	test_must_fail git bisect next
-'
-
-test_expect_success 'bisect start with one new and old' '
-	git bisect reset &&
-	git bisect start &&
-	git bisect old $HASH1 &&
-	git bisect new $HASH4 &&
-	git bisect new &&
-	git bisect new >bisect_result &&
-	grep "$HASH2 is the first new commit" bisect_result &&
-	git bisect log >log_to_replay.txt &&
-	git bisect reset
-'
-
-test_expect_success 'bisect replay with old and new' '
-	git bisect replay log_to_replay.txt >bisect_result &&
-	grep "$HASH2 is the first new commit" bisect_result &&
-	git bisect reset
-'
-
-test_expect_success 'bisect replay with CRLF log' '
-	append_cr <log_to_replay.txt >log_to_replay_crlf.txt &&
-	git bisect replay log_to_replay_crlf.txt >bisect_result_crlf &&
-	grep "$HASH2 is the first new commit" bisect_result_crlf &&
-	git bisect reset
-'
-
-test_expect_success 'bisect cannot mix old/new and good/bad' '
-	git bisect start &&
-	git bisect bad $HASH4 &&
-	test_must_fail git bisect old $HASH1
-'
-
-test_expect_success 'bisect terms needs 0 or 1 argument' '
-	git bisect reset &&
-	test_must_fail git bisect terms only-one &&
-	test_must_fail git bisect terms 1 2 &&
-	test_must_fail git bisect terms 2>actual &&
-	echo "error: no terms defined" >expected &&
-	test_i18ncmp expected actual
-'
-
-test_expect_success 'bisect terms shows good/bad after start' '
-	git bisect reset &&
-	git bisect start HEAD $HASH1 &&
-	git bisect terms --term-good >actual &&
-	echo good >expected &&
-	test_cmp expected actual &&
-	git bisect terms --term-bad >actual &&
-	echo bad >expected &&
-	test_cmp expected actual
-'
-
-test_expect_success 'bisect start with one term1 and term2' '
-	git bisect reset &&
-	git bisect start --term-old term2 --term-new term1 &&
-	git bisect term2 $HASH1 &&
-	git bisect term1 $HASH4 &&
-	git bisect term1 &&
-	git bisect term1 >bisect_result &&
-	grep "$HASH2 is the first term1 commit" bisect_result &&
-	git bisect log >log_to_replay.txt &&
-	git bisect reset
-'
-
-test_expect_success 'bisect replay with term1 and term2' '
-	git bisect replay log_to_replay.txt >bisect_result &&
-	grep "$HASH2 is the first term1 commit" bisect_result &&
-	git bisect reset
-'
-
-test_expect_success 'bisect start term1 term2' '
-	git bisect reset &&
-	git bisect start --term-new term1 --term-old term2 $HASH4 $HASH1 &&
-	git bisect term1 &&
-	git bisect term1 >bisect_result &&
-	grep "$HASH2 is the first term1 commit" bisect_result &&
-	git bisect log >log_to_replay.txt &&
-	git bisect reset
-'
-
-test_expect_success 'bisect cannot mix terms' '
-	git bisect reset &&
-	git bisect start --term-good term1 --term-bad term2 $HASH4 $HASH1 &&
-	test_must_fail git bisect a &&
-	test_must_fail git bisect b &&
-	test_must_fail git bisect bad &&
-	test_must_fail git bisect good &&
-	test_must_fail git bisect new &&
-	test_must_fail git bisect old
-'
-
-test_expect_success 'bisect terms rejects invalid terms' '
-	git bisect reset &&
-	test_must_fail git bisect start --term-good &&
-	test_must_fail git bisect start --term-good invalid..term &&
-	test_must_fail git bisect start --term-bad &&
-	test_must_fail git bisect terms --term-bad invalid..term &&
-	test_must_fail git bisect terms --term-good bad &&
-	test_must_fail git bisect terms --term-good old &&
-	test_must_fail git bisect terms --term-good skip &&
-	test_must_fail git bisect terms --term-good reset &&
-	test_path_is_missing .git/BISECT_TERMS
-'
-
-test_expect_success 'bisect start --term-* does store terms' '
-	git bisect reset &&
-	git bisect start --term-bad=one --term-good=two &&
-	git bisect terms >actual &&
-	cat <<-EOF >expected &&
-	Your current terms are two for the old state
-	and one for the new state.
-	EOF
-	test_i18ncmp expected actual &&
-	git bisect terms --term-bad >actual &&
-	echo one >expected &&
-	test_cmp expected actual &&
-	git bisect terms --term-good >actual &&
-	echo two >expected &&
-	test_cmp expected actual
-'
-
-test_expect_success 'bisect start takes options and revs in any order' '
-	git bisect reset &&
-	git bisect start --term-good one $HASH4 \
-		--term-good two --term-bad bad-term \
-		$HASH1 --term-good three -- &&
-	(git bisect terms --term-bad && git bisect terms --term-good) >actual &&
-	printf "%s\n%s\n" bad-term three >expected &&
-	test_cmp expected actual
-'
-
-test_expect_success 'git bisect reset cleans bisection state properly' '
-	git bisect reset &&
-	git bisect start &&
-	git bisect good $HASH1 &&
-	git bisect bad $HASH4 &&
-	git bisect reset &&
-	test -z "$(git for-each-ref "refs/bisect/*")" &&
-	test_path_is_missing "$GIT_DIR/BISECT_EXPECTED_REV" &&
-	test_path_is_missing "$GIT_DIR/BISECT_ANCESTORS_OK" &&
-	test_path_is_missing "$GIT_DIR/BISECT_LOG" &&
-	test_path_is_missing "$GIT_DIR/BISECT_RUN" &&
-	test_path_is_missing "$GIT_DIR/BISECT_TERMS" &&
-	test_path_is_missing "$GIT_DIR/head-name" &&
-	test_path_is_missing "$GIT_DIR/BISECT_HEAD" &&
-	test_path_is_missing "$GIT_DIR/BISECT_START"
-'
-
-test_done