X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/6b79a09cf777b209d875ab498e57a20643fd1bbf..719309aa54c8fa43bd8700f09b1e293923ed4e0a:/t/t2000-sync.sh?ds=sidebyside diff --git a/t/t2000-sync.sh b/t/t2000-sync.sh index f831df7..e489603 100755 --- a/t/t2000-sync.sh +++ b/t/t2000-sync.sh @@ -18,15 +18,15 @@ test_expect_success \ ' stg new p1 -m p1 && echo foo1 > foo1.txt && - stg add foo1.txt && + git add foo1.txt && stg refresh && stg new p2 -m p2 && echo foo2 > foo2.txt && - stg add foo2.txt && + git add foo2.txt && stg refresh && stg new p3 -m p3 && echo foo3 > foo3.txt && - stg add foo3.txt && + git add foo3.txt && stg refresh && stg export && stg pop && @@ -86,7 +86,7 @@ test_expect_success \ stg refresh && stg goto p2 && echo bar2 > bar2.txt && - stg add bar2.txt && + git add bar2.txt && stg refresh && stg goto p3 && echo bar3 >> foo3.txt && @@ -106,10 +106,10 @@ test_expect_success \ test $(cat bar2.txt) = "bar2" ' -test_expect_failure \ +test_expect_success \ 'Synchronise the first two patches with the master branch (to fail)' \ ' - stg sync -B master -a + ! stg sync -B master -a ' test_expect_success \ @@ -124,10 +124,10 @@ test_expect_success \ [ "$(echo $(stg unapplied))" = "" ] ' -test_expect_failure \ +test_expect_success \ 'Synchronise the third patch with the exported series (to fail)' \ ' - stg sync -s patches-master/series p3 + ! stg sync -s patches-master/series p3 ' test_expect_success \