X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/e4560d7ebac0f15ce5383f21c1c1696efc4fe66b..f9d9a06200ab37e52ac737ce9e3c050100e5aa15:/t/t1200-push-modified.sh diff --git a/t/t1200-push-modified.sh b/t/t1200-push-modified.sh index 2edc760..113e41d 100755 --- a/t/t1200-push-modified.sh +++ b/t/t1200-push-modified.sh @@ -26,8 +26,8 @@ test_expect_success \ printf "a\nc\n" > file && git add file && stg refresh && stg new p2 -m p2 && printf "a\nb\nc\n" > file && stg refresh && - [ "$(echo $(stg applied))" = "p1 p2" ] && - [ "$(echo $(stg unapplied))" = "" ] + [ "$(echo $(stg series --applied --noprefix))" = "p1 p2" ] && + [ "$(echo $(stg series --unapplied --noprefix))" = "" ] ) ' @@ -57,8 +57,8 @@ test_expect_success \ 'Rollback the push' ' ( cd bar && stg push --undo && - [ "$(echo $(stg applied))" = "" ] && - [ "$(echo $(stg unapplied))" = "p1 p2" ] + [ "$(echo $(stg series --applied --noprefix))" = "" ] && + [ "$(echo $(stg series --unapplied --noprefix))" = "p1 p2" ] ) ' @@ -66,8 +66,8 @@ test_expect_success \ 'Push those patches while checking they were merged upstream' ' ( cd bar && stg push --merged --all - [ "$(echo $(stg applied))" = "p1 p2" ] && - [ "$(echo $(stg unapplied))" = "" ] + [ "$(echo $(stg series --applied --noprefix))" = "p1 p2" ] && + [ "$(echo $(stg series --unapplied --noprefix))" = "" ] ) '