X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/e4560d7ebac0f15ce5383f21c1c1696efc4fe66b..f9d9a06200ab37e52ac737ce9e3c050100e5aa15:/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" ] '