Merge branch 'cb/maint-ls-files-error-report'

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 9ae2de8e8c58cbf8fad09ce897dab2e03eddccd9..62125eca8163f1ca52d57959fb872340479b9002 100755 (executable)
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -126,6 +126,18 @@ test_expect_success 'bisect reset removes packed refs' '
        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 &&
@@ -580,6 +592,37 @@ test_expect_success 'erroring out when using bad path parameters' '
        grep "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 &&
+               git bisect reset
+       ) &&
+       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 &&
+               git bisect reset
+       ) &&
+       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.
@@ -630,4 +673,74 @@ test_expect_success 'bisect fails if tree is broken on trial commit' '
        test_cmp expected.missing-tree.default error.txt
 '
 
+check_same()
+{
+       echo "Checking $1 is the same as $2" &&
+       git rev-parse "$1" > expected.same &&
+       git rev-parse "$2" > expected.actual &&
+       test_cmp expected.same expected.actual
+}
+
+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 &&
+       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 &&
+       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 &&
+       git bisect run sh -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
+"
+
 test_done