Merge git://git.bogomips.org/git-svn

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 5254b23512a411e911090cc0473bbbfd025df484..1315bab595c03f16b89060434588b505faf1c46b 100755 (executable)
--- 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 &&
+       para3=$(git rev-parse --verify HEAD) &&
+       test "$para3" = "$PARA_HASH3"
+'
+
 #
 #
 test_done