X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/d926892f4f058326d8e7efc61f7ae4f54b8a02b2..d11f4f2ab1c7823c214eec0335e50b89b42f0d3e:/t/t1301-repair.sh diff --git a/t/t1301-repair.sh b/t/t1301-repair.sh index b555b93..8d5d4e5 100755 --- a/t/t1301-repair.sh +++ b/t/t1301-repair.sh @@ -5,7 +5,7 @@ test_description='Test the repair command.' test_expect_success \ 'Repair in a non-initialized repository' \ - '! stg repair' + 'command_error stg repair' test_expect_success \ 'Initialize the StGIT repository' \ @@ -37,9 +37,9 @@ test_expect_success \ ' test_expect_success 'Turn one GIT commit into a patch' ' - [ $(stg applied | wc -l) -eq 1 ] && + [ $(stg series --applied -c) -eq 1 ] && stg repair && - [ $(stg applied | wc -l) -eq 2 ] + [ $(stg series --applied -c) -eq 2 ] ' test_expect_success \ @@ -55,9 +55,9 @@ test_expect_success \ ' test_expect_success 'Turn three GIT commits into patches' ' - [ $(stg applied | wc -l) -eq 2 ] && + [ $(stg series --applied -c) -eq 2 ] && stg repair && - [ $(stg applied | wc -l) -eq 5 ] + [ $(stg series --applied -c) -eq 5 ] ' test_expect_success \ @@ -72,9 +72,9 @@ test_expect_success \ ' test_expect_success 'Repair in the presence of a merge commit' ' - [ $(stg applied | wc -l) -eq 5 ] && + [ $(stg series --applied -c) -eq 5 ] && stg repair && - [ $(stg applied | wc -l) -eq 0 ] + [ $(stg series --applied -c) -eq 0 ] ' test_done