X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/22037590baa995704b6cc08d844e024c85c7c578..b51a910fafdea01e64a1d41100f831179bf5f5b5:/t/t2200-rebase.sh diff --git a/t/t2200-rebase.sh b/t/t2200-rebase.sh index e2d9d9a..75e1f17 100755 --- a/t/t2200-rebase.sh +++ b/t/t2200-rebase.sh @@ -11,10 +11,10 @@ test_expect_success \ 'Setup a multi-commit branch and fork an stgit stack' \ ' echo foo > file1 && - git add file1 && + stg add file1 && git commit -m a && echo foo > file2 && - git add file2 && + stg add file2 && git commit -m b && stg branch --create stack && @@ -27,7 +27,20 @@ test_expect_success \ 'Rebase to previous commit' \ ' stg rebase master~1 && - test `git rev-parse bases/stack` = `git rev-parse master~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