X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3412-rebase-root.sh;h=086c91c7b47aa2fa7b593f4f9b2f84f6b7ba3724;hb=419272d87b7a611ea55736c284df9615d22ec6af;hp=5869061c5bfdee4a84b156b8ec9d6e331a2c906c;hpb=b30ccd757354ea09b41e4359b0a5ab429d12f02e;p=git.git diff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh index 5869061c5..086c91c7b 100755 --- a/t/t3412-rebase-root.sh +++ b/t/t3412-rebase-root.sh @@ -173,14 +173,14 @@ EOF test_expect_success 'pre-rebase hook stops rebase' ' git checkout -b stops1 other && test_must_fail git rebase --root --onto master && - test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops1 + test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops1 && test 0 = $(git rev-list other...stops1 | wc -l) ' test_expect_success 'pre-rebase hook stops rebase -i' ' git checkout -b stops2 other && test_must_fail git rebase --root --onto master && - test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops2 + test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops2 && test 0 = $(git rev-list other...stops2 | wc -l) '