X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/d67cfe11dabbf8590a6fb3278e1742bffe217493..7a6a45b5f1379466bd23b33a7feed47d0b8331b7:/t/t1200-push-modified.sh diff --git a/t/t1200-push-modified.sh b/t/t1200-push-modified.sh index 0e408d0..ba4f70c 100755 --- a/t/t1200-push-modified.sh +++ b/t/t1200-push-modified.sh @@ -23,7 +23,7 @@ test_expect_success \ stg clone foo bar && ( cd bar && stg new p1 -m p1 && - printf "a\nc\n" > file && stg add file && stg refresh && + printf "a\nc\n" > file && git add file && stg refresh && stg new p2 -m p2 && printf "a\nb\nc\n" > file && stg refresh && [ "$(echo $(stg applied))" = "p1 p2" ] && @@ -47,9 +47,9 @@ test_expect_success \ ) " -test_expect_failure \ +test_expect_success \ 'Attempt to push the first of those patches without --merged' \ - "(cd bar && stg push + "(cd bar && ! stg push ) "