From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: j6t@kdbg.org, gitster@pobox.com, jnareb@gmail.com,
Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH 4/5] bisect: add tests for the --no-checkout option.
Date: Sat, 30 Jul 2011 18:28:30 +1000 [thread overview]
Message-ID: <1312014511-7157-5-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <1312014511-7157-1-git-send-email-jon.seymour@gmail.com>
We expect to git-bisect --no-checkout to tolerate various kinds of repository damage.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
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
next prev parent reply other threads:[~2011-07-30 8:29 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-30 8:28 [PATCH 0/5] bisect: Add support for a --no-checkout option Jon Seymour
2011-07-30 8:28 ` [PATCH 1/5] bisect: add tests to document expected behaviour in presence of broken trees Jon Seymour
2011-07-30 8:28 ` [PATCH 2/5] bisect: introduce support for --no-checkout=<ref> option Jon Seymour
2011-07-30 13:49 ` Christian Couder
2011-07-30 8:28 ` [PATCH 3/5] bisect: introduce --no-checkout[=<ref>] support into porcelain Jon Seymour
2011-07-30 14:34 ` Christian Couder
2011-07-30 17:00 ` Jon Seymour
2011-07-31 0:36 ` Christian Couder
2011-08-01 0:53 ` Junio C Hamano
2011-08-01 4:35 ` Christian Couder
2011-07-30 8:28 ` Jon Seymour [this message]
2011-07-30 8:28 ` [PATCH 5/5] bisect: add documentation for --no-checkout[=<ref>] option Jon Seymour
2011-07-30 8:30 ` [PATCH 0/5] bisect: Add support for a --no-checkout option Jon Seymour
2011-07-30 13:48 ` Christian Couder
2011-07-30 13:58 ` Jon Seymour
2011-07-30 14:19 ` Christian Couder
2011-08-01 1:00 ` Junio C Hamano
2011-08-01 4:42 ` Christian Couder
2011-08-01 5:27 ` Jon Seymour
2011-08-01 17:33 ` Junio C Hamano
2011-08-01 22:19 ` Jon Seymour
2011-08-01 23:33 ` Junio C Hamano
2011-08-02 1:15 ` Jon Seymour
2011-08-02 1:41 ` Jon Seymour
2011-08-02 17:53 ` Junio C Hamano
2011-08-02 21:27 ` Jon Seymour
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1312014511-7157-5-git-send-email-jon.seymour@gmail.com \
--to=jon.seymour@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=jnareb@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).