X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/7a6a45b5f1379466bd23b33a7feed47d0b8331b7..f9d9a06200ab37e52ac737ce9e3c050100e5aa15:/t/t2600-coalesce.sh diff --git a/t/t2600-coalesce.sh b/t/t2600-coalesce.sh index f13a309..ef5bf99 100755 --- a/t/t2600-coalesce.sh +++ b/t/t2600-coalesce.sh @@ -15,17 +15,17 @@ test_expect_success 'Initialize StGit stack' ' ' test_expect_success 'Coalesce some patches' ' - [ "$(echo $(stg applied))" = "p0 p1 p2 p3" ] && - [ "$(echo $(stg unapplied))" = "" ] && + [ "$(echo $(stg series --applied --noprefix))" = "p0 p1 p2 p3" ] && + [ "$(echo $(stg series --unapplied --noprefix))" = "" ] && stg coalesce --name=q0 --message="wee woo" p1 p2 && - [ "$(echo $(stg applied))" = "p0 q0 p3" ] && - [ "$(echo $(stg unapplied))" = "" ] + [ "$(echo $(stg series --applied --noprefix))" = "p0 q0 p3" ] && + [ "$(echo $(stg series --unapplied --noprefix))" = "" ] ' test_expect_success 'Coalesce at stack top' ' stg coalesce --name=q1 --message="wee woo wham" q0 p3 && - [ "$(echo $(stg applied))" = "p0 q1" ] && - [ "$(echo $(stg unapplied))" = "" ] + [ "$(echo $(stg series --applied --noprefix))" = "p0 q1" ] && + [ "$(echo $(stg series --unapplied --noprefix))" = "" ] ' test_done