X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/e4b8c5e722121c824d1c767f52f97c08fd6b5ca5..f249607484ed865696bd96a2055468b98b4e319f:/t/t2200-rebase.sh diff --git a/t/t2200-rebase.sh b/t/t2200-rebase.sh index c142e08..adbf242 100755 --- a/t/t2200-rebase.sh +++ b/t/t2200-rebase.sh @@ -27,20 +27,20 @@ test_expect_success \ 'Rebase to previous commit' \ ' stg rebase master~1 && - test `stg id base@stack` = `git rev-parse master~1` && - test `stg applied | wc -l` = 1 + test `stg id stack:{base}` = `git rev-parse master~1` && + test `stg series --applied -c` = 1 ' -test_expect_failure \ +test_expect_success \ 'Attempt rebase to non-existing commit' \ ' - stg rebase not-a-ref + command_error stg rebase not-a-ref ' test_expect_success \ 'Check patches were re-applied' \ ' - test $(stg applied | wc -l) = 1 + test $(stg series --applied -c) = 1 ' test_done