From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH 1/9] bisect: add tests to document expected behaviour in presence of broken trees.
Date: Sun, 24 Jul 2011 15:57:46 +1000 [thread overview]
Message-ID: <1311487074-25070-2-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <1311487074-25070-1-git-send-email-jon.seymour@gmail.com>
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t6030-bisect-porcelain.sh | 50 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index b5063b6..2c14fb0 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -573,5 +573,55 @@ 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 &&
+ add_line_into_file "5(broken): first line on a broken branch" hello2 &&
+ BROKEN_HASH5=$(git rev-parse --verify HEAD) &&
+ mkdir missing &&
+ :> missing/MISSING &&
+ git add missing/MISSING &&
+ git commit -m "Added file that will be deleted"
+ BROKEN_HASH6=$(git rev-parse --verify HEAD) &&
+ add_line_into_file "6(broken): second line on a broken branch" hello2 &&
+ BROKEN_HASH7=$(git rev-parse --verify HEAD) &&
+ add_line_into_file "7(broken): third line on a broken branch" hello2 &&
+ BROKEN_HASH8=$(git rev-parse --verify HEAD) &&
+ git rm missing/MISSING &&
+ git commit -m "Remove missing file"
+ BROKEN_HASH9=$(git rev-parse --verify HEAD) &&
+ rm .git/objects/39/f7e61a724187ab767d2e08442d9b6b9dab587d
+'
+
+echo "" > expected.ok
+cat > expected.missing-tree.default <<EOF
+fatal: unable to read tree 39f7e61a724187ab767d2e08442d9b6b9dab587d
+EOF
+cat > expected.missing-tree.ignored <<EOF
+fatal: unable to read tree 39f7e61a724187ab767d2e08442d9b6b9dab587d
+warn: checkout failed. Updating HEAD directly. The working tree and index may be inconsistent.
+EOF
+
+test_expect_success 'bisect fails if tree is broken on start commit' '
+ git bisect reset &&
+ test_must_fail git bisect start $BROKEN_HASH7 $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 $HASH4 2>error.txt &&
+ git update-ref --no-deref HEAD broken &&
+ test_cmp expected.missing-tree.default error.txt
+'
+
test_done
--
1.7.6.347.g96e0b.dirty
next prev parent reply other threads:[~2011-07-24 5:58 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-24 5:57 [RFC 0/9] bisect: allow git bisect to be used with repos containing damaged trees Jon Seymour
2011-07-24 5:57 ` Jon Seymour [this message]
2011-07-24 5:57 ` [PATCH 2/9] bisect: introduce a --ignore-checkout-failure option to bisect--helper Jon Seymour
2011-07-24 5:57 ` [PATCH 3/9] bisect: implement support for --ignore-checkout-failure option Jon Seymour
2011-07-24 5:57 ` [PATCH 4/9] bisect: introduce a helper function to tolerate checkout failures Jon Seymour
2011-07-24 5:57 ` [PATCH 5/9] bisect: replace existing calls to git checkout with bisect_checkout_with_ignore Jon Seymour
2011-07-24 5:57 ` [PATCH 6/9] bisect: enable --ignore-checkout-failure in the porcelain Jon Seymour
2011-07-24 5:57 ` [PATCH 7/9] bisect: better diagnostics, in case of mis-typed option Jon Seymour
2011-07-24 5:57 ` [PATCH 8/9] bisect: add tests for --ignore-checkout-failure option Jon Seymour
2011-07-24 5:57 ` [PATCH 9/9] bisect: add documentation " Jon Seymour
2011-07-24 8:05 ` [RFC 0/9] bisect: allow git bisect to be used with repos containing damaged trees Johannes Sixt
2011-07-24 8:54 ` Jon Seymour
2011-07-24 18:35 ` Junio C Hamano
2011-07-25 9:28 ` Jon Seymour
2011-07-25 18:14 ` Junio C Hamano
2011-07-25 23:27 ` Jon Seymour
2011-07-25 18:48 ` Johannes Sixt
2011-07-25 23:38 ` Jon Seymour
2011-07-26 7:43 ` Jakub Narebski
2011-07-26 8:26 ` Jon Seymour
2011-07-26 13:28 ` 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=1311487074-25070-2-git-send-email-jon.seymour@gmail.com \
--to=jon.seymour@gmail.com \
--cc=git@vger.kernel.org \
/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).