X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/a02ba4077f12578fe31c99d903488804a656e1c4..6ce2faa0ac6e5de67cedee09e257e69f9ebff1e8:/t/t2200-rebase.sh?ds=inline diff --git a/t/t2200-rebase.sh b/t/t2200-rebase.sh index d9b6faf..ec2a104 100755 --- a/t/t2200-rebase.sh +++ b/t/t2200-rebase.sh @@ -31,10 +31,10 @@ test_expect_success \ test `stg applied | wc -l` = 1 ' -test_expect_failure \ +test_expect_success \ 'Attempt rebase to non-existing commit' \ ' - stg rebase not-a-ref + ! stg rebase not-a-ref ' test_expect_success \ @@ -43,20 +43,4 @@ test_expect_success \ test $(stg applied | wc -l) = 1 ' -test_expect_success \ - 'Rebase to next commit' \ - ' - stg rebase master && - test $(stg id base@stack) = $(git rev-parse master) - ' - -test_expect_success \ - 'Commit the patch and rebase again' \ - ' - stg commit && - git tag committed-here && - stg rebase master && - test $(stg id base@stack) = $(git rev-parse master) - ' - test_done