From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: chriscool@tuxfamily.org, gitster@pobox.com, j6t@kdbg.org,
jnareb@gmail.com, Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH v13 6/8] bisect: add tests for the --no-checkout option.
Date: Tue, 2 Aug 2011 21:29:03 +1000 [thread overview]
Message-ID: <1312284545-2426-7-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <1312284545-2426-1-git-send-email-jon.seymour@gmail.com>
These tests verify that git-bisect --no-checkout can successfully
bisect commit histories that reference damaged trees.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t6030-bisect-porcelain.sh | 70 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 70 insertions(+), 0 deletions(-)
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 9ae2de8..a1e0ddc 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -616,6 +616,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 &&
@@ -630,4 +638,66 @@ 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: demonstrate identification of damage boundary' "
+ git bisect reset &&
+ git checkout broken &&
+ git bisect start broken master --no-checkout &&
+ git bisect run eval '
+rc=1;
+if git rev-list --objects HEAD >tmp.$$; then
+ git pack-objects --stdout >/dev/null < tmp.$$ && rc=0;
+fi;
+rm tmp.$$;
+test \$rc -eq 0;' &&
+ check_same BROKEN_HASH6 bisect/bad &&
+ git bisect reset
+"
+
test_done
--
1.7.6.353.g3461
next prev parent reply other threads:[~2011-08-02 11:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-02 11:28 [PATCH v13 0/8] bisect: Add support for --no-checkout option Jon Seymour
2011-08-02 11:28 ` [PATCH v13 1/8] bisect: move argument parsing before state modification Jon Seymour
2011-08-02 11:28 ` [PATCH v13 2/8] bisect: use && to connect statements that are deferred with eval Jon Seymour
2011-08-02 11:29 ` [PATCH v13 3/8] bisect: add tests to document expected behaviour in presence of broken trees Jon Seymour
2011-08-02 11:29 ` [PATCH v13 4/8] bisect: introduce support for --no-checkout option Jon Seymour
2011-08-02 12:16 ` Christian Couder
2011-08-02 14:42 ` Jon Seymour
2011-08-02 18:00 ` Junio C Hamano
2011-08-02 21:24 ` Jon Seymour
2011-08-02 22:05 ` Junio C Hamano
2011-08-02 22:19 ` Jon Seymour
2011-08-02 11:29 ` [PATCH v13 5/8] bisect: introduce --no-checkout support into porcelain Jon Seymour
2011-08-02 12:04 ` Christian Couder
2011-08-02 14:41 ` Jon Seymour
2011-08-03 5:27 ` Christian Couder
2011-08-03 12:46 ` Jon Seymour
2011-08-03 13:24 ` Jon Seymour
2011-08-03 14:09 ` Christian Couder
2011-08-03 15:13 ` Jon Seymour
2011-08-03 19:41 ` Christian Couder
2011-08-02 11:29 ` Jon Seymour [this message]
2011-08-02 11:29 ` [PATCH v13 7/8] bisect: add documentation for --no-checkout option Jon Seymour
2011-08-02 11:29 ` [PATCH v13 8/8] bisect: change bisect function to update BISECT_HEAD, rather than HEAD 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=1312284545-2426-7-git-send-email-jon.seymour@gmail.com \
--to=jon.seymour@gmail.com \
--cc=chriscool@tuxfamily.org \
--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).