X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/b13d080c1b6f59d78c276932f72da1971cc6fd2d..f249607484ed865696bd96a2055468b98b4e319f:/t/t2200-rebase.sh diff --git a/t/t2200-rebase.sh b/t/t2200-rebase.sh index 882572c..adbf242 100755 --- a/t/t2200-rebase.sh +++ b/t/t2200-rebase.sh @@ -27,8 +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_success \ + 'Attempt rebase to non-existing commit' \ + ' + command_error stg rebase not-a-ref + ' + +test_expect_success \ + 'Check patches were re-applied' \ + ' + test $(stg series --applied -c) = 1 ' test_done