X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/bcfe759bc421f8e3b5b5866434948b0e406f9a60..4f5a8c722ee88f9be891297353ae26f676bb0213:/t/t1201-pull-trailing.sh diff --git a/t/t1201-pull-trailing.sh b/t/t1201-pull-trailing.sh index 142f894..42c6619 100755 --- a/t/t1201-pull-trailing.sh +++ b/t/t1201-pull-trailing.sh @@ -35,8 +35,20 @@ test_expect_success \ " test_expect_success \ + 'Pull those patches applied upstream, without pushing' \ + "(cd bar && stg pull --nopush + ) +" + +test_expect_success \ + 'Try to push those patches without merge detection' \ + "(cd bar && stg push --all + ) +" + +test_expect_success \ 'Pull those patches applied upstream' \ - "(cd bar && stg pull + "(cd bar && stg push --undo && stg push --all --merged ) "