X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/f03004e2c26efcd6b172a915e8e0d2f9a7cb064b..53388a712669bc5db72030fb5fe7addb5da0716e:/t/t3000-dirty-merge.sh diff --git a/t/t3000-dirty-merge.sh b/t/t3000-dirty-merge.sh index 4dd6da3..f0f79d5 100755 --- a/t/t3000-dirty-merge.sh +++ b/t/t3000-dirty-merge.sh @@ -24,11 +24,11 @@ test_expect_success 'Pop one patch and update the other' ' test_expect_success 'Push with dirty worktree' ' echo 4 > a && - [ "$(echo $(stg applied))" = "p1" ] && - [ "$(echo $(stg unapplied))" = "p2" ] && + [ "$(echo $(stg series --applied --noprefix))" = "p1" ] && + [ "$(echo $(stg series --unapplied --noprefix))" = "p2" ] && conflict stg goto p2 && - [ "$(echo $(stg applied))" = "p1" ] && - [ "$(echo $(stg unapplied))" = "p2" ] && + [ "$(echo $(stg series --applied --noprefix))" = "p1" ] && + [ "$(echo $(stg series --unapplied --noprefix))" = "p2" ] && [ "$(echo $(cat a))" = "4" ] '