X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/1eae3bf5ef8561508d83845f27b61c7533ba3378..de8efe1efc4a495eca0614aa9f6c1910d5838f99:/t/t1000-branch-create.sh diff --git a/t/t1000-branch-create.sh b/t/t1000-branch-create.sh index 5a097a4..2626c73 100755 --- a/t/t1000-branch-create.sh +++ b/t/t1000-branch-create.sh @@ -26,7 +26,7 @@ test_expect_success \ test_expect_success \ 'Try to create an stgit branch with a spurious patches/ entry' ' - ! stg branch -c foo1 + command_error stg branch -c foo1 ' test_expect_success \ @@ -43,7 +43,7 @@ test_expect_success \ test_expect_success \ 'Try to create an stgit branch with an existing git branch by that name' ' - ! stg branch -c foo2 + command_error stg branch -c foo2 ' test_expect_success \ @@ -58,7 +58,7 @@ test_expect_success \ test_expect_success \ 'Create an invalid refs/heads/ entry' ' touch .git/refs/heads/foo3 && - ! stg branch -c foo3 + command_error stg branch -c foo3 ' test_expect_failure \ @@ -78,16 +78,16 @@ test_expect_success \ 'Setup two commits including removal of generated files' ' git init && touch file1 file2 && - git add file1 file2 && + stg add file1 file2 && git commit -m 1 && - git rm file1 file2 && + stg rm file1 file2 && git commit -m 2 && touch file2 ' test_expect_success \ 'Create branch down the stack, behind the conflict caused by the generated file' ' - ! stg branch --create foo4 master^ + command_error stg branch --create foo4 master^ ' test_expect_success \