X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/87bcf96e1932268c3bb67c99bde6c8e897ec9fdf..6ce2faa0ac6e5de67cedee09e257e69f9ebff1e8:/t/t1600-delete-one.sh?ds=sidebyside diff --git a/t/t1600-delete-one.sh b/t/t1600-delete-one.sh index df03d79..c3451d8 100755 --- a/t/t1600-delete-one.sh +++ b/t/t1600-delete-one.sh @@ -12,7 +12,7 @@ test_expect_success \ ' stg new foo -m foo && echo foo > foo.txt && - stg add foo.txt && + git add foo.txt && stg refresh ' @@ -47,7 +47,7 @@ test_expect_success \ ' stg new foo -m foo && echo foo > foo.txt && - stg add foo.txt && + git add foo.txt && stg refresh && stg pop ' @@ -65,11 +65,11 @@ test_expect_success \ ' stg new foo -m foo && echo foo > foo.txt && - stg add foo.txt && + git add foo.txt && stg refresh && stg new bar -m bar && echo bar > bar.txt && - stg add bar.txt && + git add bar.txt && stg refresh ' @@ -77,8 +77,8 @@ test_expect_success \ 'Try to delete a non-topmost applied patch' \ ' [ $(stg applied | wc -l) -eq 2 ] && - ! stg delete foo && - [ $(stg applied | wc -l) -eq 2 ] + stg delete foo && + [ $(stg applied | wc -l) -eq 1 ] ' test_expect_success \ @@ -87,22 +87,22 @@ test_expect_success \ stg branch --create br && stg new baz -m baz && echo baz > baz.txt && - stg add baz.txt && + git add baz.txt && stg refresh && stg branch master && stg new baz -m baz && echo baz > baz.txt && - stg add baz.txt && + git add baz.txt && stg refresh ' test_expect_success \ 'Delete a patch in another branch' \ ' - [ $(stg applied | wc -l) -eq 3 ] && + [ $(stg applied | wc -l) -eq 2 ] && [ $(stg applied -b br | wc -l) -eq 1 ] && stg delete -b br baz && - [ $(stg applied | wc -l) -eq 3 ] && + [ $(stg applied | wc -l) -eq 2 ] && [ $(stg applied -b br | wc -l) -eq 0 ] '