X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/3ce5fec2ef4154369653a41eb7692aca25878298..c7506039d0299c093140857b7a617ec6bcdbfc13:/t/t1201-pull-trailing.sh diff --git a/t/t1201-pull-trailing.sh b/t/t1201-pull-trailing.sh index 3a7efc1..a993aeb 100755 --- a/t/t1201-pull-trailing.sh +++ b/t/t1201-pull-trailing.sh @@ -18,7 +18,7 @@ test_create_repo foo test_expect_success \ 'Setup and clone tree, and setup changes' \ "(cd foo && - printf 'a\nb\n' > file && git add file && git commit -m . + printf 'a\nb\n' > file && stg add file && git commit -m . ) && stg clone foo bar && (cd bar && stg new p1 -m p1 @@ -49,7 +49,7 @@ test_expect_success \ test_expect_success \ 'Pull those patches applied upstream' \ - "(cd bar && stg push --undo && stg push --all --merged + "(cd bar && stg undo && stg push --all --merged ) "