From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH 8/9] bisect: add tests for --ignore-checkout-failure option.
Date: Sun, 24 Jul 2011 15:57:53 +1000 [thread overview]
Message-ID: <1311487074-25070-9-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 | 69 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 69 insertions(+), 0 deletions(-)
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 2c14fb0..32fb434 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -624,4 +624,73 @@ test_expect_success 'bisect fails if tree is broken on trial commit' '
test_cmp expected.missing-tree.default error.txt
'
+test_expect_success 'bisect: --ignore-checkout-failure - start commit bad' '
+ git bisect reset &&
+ git bisect start $BROKEN_HASH7 $HASH4 --ignore-checkout-failure 2>error.txt
+ test_cmp expected.missing-tree.ignored error.txt &&
+ broken6=$(git rev-parse HEAD) &&
+ test "$broken6" = "$BROKEN_HASH6" &&
+ git bisect reset
+'
+
+test_expect_success 'bisect: --ignore-checkout-failure - trial commit bad' '
+ git bisect reset &&
+ git bisect start broken $HASH4 --ignore-checkout-failure 2>error.txt
+ test_cmp expected.missing-tree.ignored error.txt &&
+ broken6=$(git rev-parse HEAD) &&
+ test "$broken6" = "$BROKEN_HASH6" &&
+ git bisect reset
+'
+
+test_expect_success 'bisect: --ignore-checkout-failure - target before breakage' '
+ git bisect reset &&
+ git bisect start broken $HASH4 --ignore-checkout-failure 2>error.txt
+ test_cmp expected.missing-tree.ignored error.txt &&
+ broken6=$(git rev-parse HEAD) &&
+ test "$broken6" = "$BROKEN_HASH6" &&
+ git bisect bad HEAD &&
+ broken5=$(git rev-parse HEAD) &&
+ test "$broken5" = "$BROKEN_HASH5" &&
+ git bisect bad HEAD > my_bisect_log.txt &&
+ broken4=$(git rev-parse HEAD) &&
+ test "$broken4" = "$HASH4" &&
+ echo "$BROKEN_HASH5 is the first bad commit" > expected.txt &&
+ test_cmp expected.txt my_bisect_log.txt
+ git bisect reset
+'
+
+test_expect_success 'bisect: --ignore-checkout-failure - target in breakage' '
+ git bisect reset &&
+ git bisect start broken $HASH4 --ignore-checkout-failure 2>error.txt
+ test_cmp expected.missing-tree.ignored error.txt &&
+ broken6=$(git rev-parse HEAD) &&
+ test "$broken6" = "$BROKEN_HASH6" &&
+ git bisect bad HEAD &&
+ broken5=$(git rev-parse HEAD) &&
+ test "$broken5" = "$BROKEN_HASH5" &&
+ git bisect good HEAD > my_bisect_log.txt &&
+ broken6=$(git rev-parse HEAD) &&
+ test "$broken6" = "$BROKEN_HASH6" &&
+ echo "$BROKEN_HASH6 is the first bad commit" > expected.txt &&
+ test_cmp expected.txt my_bisect_log.txt
+ git bisect reset
+'
+
+test_expect_success 'bisect: --ignore-checkout-failure - target after breakage' '
+ git bisect reset &&
+ git bisect start broken $HASH4 --ignore-checkout-failure 2>error.txt
+ test_cmp expected.missing-tree.ignored error.txt &&
+ broken6=$(git rev-parse HEAD) &&
+ test "$broken6" = "$BROKEN_HASH6" &&
+ git bisect good HEAD &&
+ broken8=$(git rev-parse HEAD) &&
+ test "$broken8" = "$BROKEN_HASH8" &&
+ git bisect good HEAD > my_bisect_log.txt &&
+ broken9=$(git rev-parse HEAD) &&
+ test "$broken9" = "$BROKEN_HASH9" &&
+ echo "$BROKEN_HASH9 is the first bad commit" > expected.txt &&
+ test_cmp expected.txt my_bisect_log.txt
+ git bisect reset
+'
+
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 ` [PATCH 1/9] bisect: add tests to document expected behaviour in presence of broken trees Jon Seymour
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 ` Jon Seymour [this message]
2011-07-24 5:57 ` [PATCH 9/9] bisect: add documentation for --ignore-checkout-failure option 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-9-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).