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 v14 3/8] bisect: add tests to document expected behaviour in presence of broken trees.
Date: Wed, 3 Aug 2011 08:15:57 +1000 [thread overview]
Message-ID: <1312323362-20096-4-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <1312323362-20096-1-git-send-email-jon.seymour@gmail.com>
If the repo is broken, we expect bisect to fail.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t6030-bisect-porcelain.sh | 48 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index b3d1b14..9ae2de8 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -581,5 +581,53 @@ test_expect_success 'erroring out when using bad path parameters' '
'
#
+# 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 &&
+ 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/39/f7e61a724187ab767d2e08442d9b6b9dab587d
+'
+
+echo "" > expected.ok
+cat > expected.missing-tree.default <<EOF
+fatal: unable to read tree 39f7e61a724187ab767d2e08442d9b6b9dab587d
+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
+'
+
test_done
--
1.7.6.353.gb3ae7e
next prev parent reply other threads:[~2011-08-02 22:16 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-02 22:15 [PATCH v14 0/8] bisect: Add support for --no-checkout option Jon Seymour
2011-08-02 22:15 ` [PATCH v14 1/8] bisect: move argument parsing before state modification Jon Seymour
2011-08-02 22:15 ` [PATCH v14 2/8] bisect: use && to connect statements that are deferred with eval Jon Seymour
2011-08-02 22:15 ` Jon Seymour [this message]
2011-08-02 22:15 ` [PATCH v14 4/8] bisect: introduce support for --no-checkout option Jon Seymour
2011-08-02 22:15 ` [PATCH v14 5/8] bisect: introduce --no-checkout support into porcelain Jon Seymour
2011-08-02 23:01 ` Junio C Hamano
2011-08-02 23:16 ` Junio C Hamano
2011-08-03 5:28 ` Christian Couder
2011-08-03 13:16 ` Jon Seymour
2011-08-03 15:24 ` Jon Seymour
2011-08-03 17:01 ` Junio C Hamano
2011-08-03 18:57 ` Jonathan Nieder
2011-08-03 21:40 ` Jon Seymour
2011-08-03 21:45 ` Jonathan Nieder
2011-08-03 5:17 ` Christian Couder
2011-08-02 22:16 ` [PATCH v14 6/8] bisect: add tests for the --no-checkout option Jon Seymour
2011-08-02 22:16 ` [PATCH v14 7/8] bisect: add documentation for " Jon Seymour
2011-08-02 22:16 ` [PATCH v14 8/8] bisect: change bisect function to update BISECT_HEAD, rather than HEAD Jon Seymour
2011-08-03 4:43 ` Christian Couder
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=1312323362-20096-4-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).