We expect to git-bisect --no-checkout to tolerate various kinds of repository damage.
Signed-off-by: Jon Seymour <jon.seymour@xxxxxxxxx>
---
t/t6030-bisect-porcelain.sh | 84 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 84 insertions(+), 0 deletions(-)
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index c28da2d..a9e86d2 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -608,6 +608,14 @@ cat > expected.missing-tree.default <<EOF
fatal: unable to read tree 39f7e61a724187ab767d2e08442d9b6b9dab587d
EOF
+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 fails if tree is broken on start commit' '
git bisect reset &&
test_must_fail git bisect start BROKEN_HASH7 BROKEN_HASH4 2>error.txt &&
@@ -622,4 +630,80 @@ test_expect_success 'bisect fails if tree is broken on trial commit' '
test_cmp expected.missing-tree.default error.txt
'
+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 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 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 HEAD &&
+ git bisect bad HEAD &&
+ check_same BROKEN_HASH5 HEAD &&
+ git bisect bad 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 HEAD &&
+ git bisect bad HEAD &&
+ check_same BROKEN_HASH5 HEAD &&
+ git bisect good 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 HEAD &&
+ git bisect good HEAD &&
+ check_same BROKEN_HASH8 HEAD &&
+ git bisect good HEAD &&
+ check_same BROKEN_HASH9 bisect/bad &&
+ git bisect reset
+'
+
+test_expect_success 'bisect: --no-checkout=CURSOR - check HEAD is unmodified' '
+ git bisect reset &&
+ git checkout broken &&
+ BROKEN=$(git rev-parse broken) &&
+ git bisect start broken BROKEN_HASH4 --no-checkout=CURSOR &&
+ check_same CURSOR BROKEN_HASH6 &&
+ test "refs/heads/broken" = "$(git rev-parse --symbolic-full-name HEAD)" &&
+ git bisect bad CURSOR &&
+ test "refs/heads/broken" = "$(git rev-parse --symbolic-full-name HEAD)" &&
+ check_same CURSOR BROKEN_HASH5 &&
+ test "refs/heads/broken" = "$(git rev-parse --symbolic-full-name HEAD)" &&
+ git bisect good CURSOR &&
+ check_same BROKEN_HASH6 bisect/bad &&
+ test "refs/heads/broken" = "$(git rev-parse --symbolic-full-name HEAD)" &&
+ git bisect reset &&
+ test "refs/heads/broken" = "$(git rev-parse --symbolic-full-name HEAD)" &&
+ check_same HEAD broken &&
+ check_same broken $BROKEN
+'
+
+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 eval "git rev-list --objects HEAD && git rev-list --objects HEAD | git pack-objects --stdout >/dev/null || false" &&
+ check_same BROKEN_HASH6 bisect/bad &&
+ git bisect reset
+'
+
test_done
--
1.7.6.387.g991c2
--
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