X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/5dc51fea740a2e2e2fa3d4462efe719ce0ab02b1..92d99c04b37e536ef01dad4f9936a67f1da710fa:/t/t1201-pull-trailing.sh diff --git a/t/t1201-pull-trailing.sh b/t/t1201-pull-trailing.sh index e5fac88..42c6619 100755 --- a/t/t1201-pull-trailing.sh +++ b/t/t1201-pull-trailing.sh @@ -40,7 +40,7 @@ test_expect_success \ ) " -test_expect_failure \ +test_expect_success \ 'Try to push those patches without merge detection' \ "(cd bar && stg push --all ) @@ -48,7 +48,7 @@ test_expect_failure \ test_expect_success \ 'Pull those patches applied upstream' \ - "(cd bar && stg push --all --merged + "(cd bar && stg push --undo && stg push --all --merged ) "