X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/baf8241d1b7835ba31125d2b75683601ee2b0403..de8efe1efc4a495eca0614aa9f6c1910d5838f99:/t/t1200-push-modified.sh diff --git a/t/t1200-push-modified.sh b/t/t1200-push-modified.sh index a591124..e04dac5 100755 --- a/t/t1200-push-modified.sh +++ b/t/t1200-push-modified.sh @@ -23,7 +23,7 @@ test_expect_success \ stg clone foo bar && ( cd bar && stg new p1 -m p1 && - printf "a\nc\n" > file && git add file && stg refresh && + printf "a\nc\n" > file && stg add file && stg refresh && stg new p2 -m p2 && printf "a\nb\nc\n" > file && stg refresh && [ "$(echo $(stg series --applied --noprefix))" = "p1 p2" ] && @@ -49,7 +49,7 @@ test_expect_success \ test_expect_success \ 'Attempt to push the first of those patches without --merged' \ - "(cd bar && conflict_old stg push + "(cd bar && conflict stg push ) "