X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/f9d9a06200ab37e52ac737ce9e3c050100e5aa15..dacc59cb88970716a41b14898fc49e1616cedadf:/t/t1200-push-modified.sh diff --git a/t/t1200-push-modified.sh b/t/t1200-push-modified.sh index 113e41d..a591124 100755 --- a/t/t1200-push-modified.sh +++ b/t/t1200-push-modified.sh @@ -35,8 +35,8 @@ test_expect_success \ 'Port those patches to orig tree' ' ( cd foo && - GIT_DIR=../bar/.git git-format-patch --stdout \ - $(cd ../bar && stg id master:{base})..HEAD | git-am -3 -k + GIT_DIR=../bar/.git git format-patch --stdout \ + $(cd ../bar && stg id master:{base})..HEAD | git am -3 -k ) ' @@ -56,7 +56,7 @@ test_expect_success \ test_expect_success \ 'Rollback the push' ' ( - cd bar && stg push --undo && + cd bar && stg undo --hard && [ "$(echo $(stg series --applied --noprefix))" = "" ] && [ "$(echo $(stg series --unapplied --noprefix))" = "p1 p2" ] )