X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/e0d32236084276e0e509180ab7629ab23aee11c5..490add07e9490b2654d22ca2cd3b8dcc0cc0cc9b:/t/t2101-pull-policy-pull.sh diff --git a/t/t2101-pull-policy-pull.sh b/t/t2101-pull-policy-pull.sh index 793491c..14d5adb 100755 --- a/t/t2101-pull-policy-pull.sh +++ b/t/t2101-pull-policy-pull.sh @@ -39,11 +39,11 @@ test_expect_success \ # as rewinding, and thus heads/origin is not moved, but the stack # is still correctly rebased -test_expect_failure \ +test_expect_success \ 'Rewind/rewrite upstream commit and pull it from clone, without --merged' \ ' (cd upstream && echo b >> file2 && stg refresh) && - (cd clone && stg pull) + (cd clone && ! stg pull) ' test_expect_success \