summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Christian Couder <chriscool@tuxfamily.org>2009-06-06 06:41:35 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-06-06 11:26:56 -0700
commita66037c9755a2beb49bbd915e6f0dd9b1a732925 (patch)
tree3bfcae69a694bff2457b4541f1eb95ad2665a474
parentbisect: when skipping, choose a commit away from a skipped commit (diff)
downloadtgif-a66037c9755a2beb49bbd915e6f0dd9b1a732925.tar.xz
t6030: test skipping away from an already skipped commit
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t6030-bisect-porcelain.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 5254b23512..4556cdd8d2 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -555,6 +555,18 @@ test_expect_success 'restricting bisection on one dir and a file' '
grep "$PARA_HASH4 is first bad commit" my_bisect_log.txt
'
+test_expect_success 'skipping away from skipped commit' '
+ git bisect start $PARA_HASH7 $HASH1 &&
+ para4=$(git rev-parse --verify HEAD) &&
+ test "$para4" = "$PARA_HASH4" &&
+ git bisect skip &&
+ hash7=$(git rev-parse --verify HEAD) &&
+ test "$hash7" = "$HASH7" &&
+ git bisect skip &&
+ hash3=$(git rev-parse --verify HEAD) &&
+ test "$hash3" = "$HASH3"
+'
+
#
#
test_done