X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/d756053f114b1fdf46c2694e940f1197822afcc7..f9d9a06200ab37e52ac737ce9e3c050100e5aa15:/t/t2500-clean.sh diff --git a/t/t2500-clean.sh b/t/t2500-clean.sh index abde9cf..99fd29f 100755 --- a/t/t2500-clean.sh +++ b/t/t2500-clean.sh @@ -17,11 +17,11 @@ test_expect_success 'Initialize StGit stack' ' ' test_expect_success 'Clean empty patches' ' - [ "$(echo $(stg applied))" = "e0 p0 e1" ] && - [ "$(echo $(stg unapplied))" = "e2" ] && + [ "$(echo $(stg series --applied --noprefix))" = "e0 p0 e1" ] && + [ "$(echo $(stg series --unapplied --noprefix))" = "e2" ] && stg clean && - [ "$(echo $(stg applied))" = "p0" ] && - [ "$(echo $(stg unapplied))" = "" ] + [ "$(echo $(stg series --applied --noprefix))" = "p0" ] && + [ "$(echo $(stg series --unapplied --noprefix))" = "" ] ' test_expect_success 'Create a conflict' ' @@ -37,8 +37,8 @@ test_expect_success 'Create a conflict' ' test_expect_success 'Make sure conflicting patches are preserved' ' stg clean && - [ "$(echo $(stg applied))" = "p0 p2 p1" ] && - [ "$(echo $(stg unapplied))" = "" ] + [ "$(echo $(stg series --applied --noprefix))" = "p0 p2 p1" ] && + [ "$(echo $(stg series --unapplied --noprefix))" = "" ] ' test_done