X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fpush-newpackage;h=d0f3f35a40d9927af72afb01fd3aa5c729836046;hp=2d016572316059d588c3ed4877e2d50e56b88c2b;hb=d45a224aee98c04bf3038dcda9b258ba5abf0d70;hpb=c2d43f9859a861f8522c32bb42e9f74fd229b6bf

diff --git a/tests/tests/push-newpackage b/tests/tests/push-newpackage
index 2d016572..d0f3f35a 100755
--- a/tests/tests/push-newpackage
+++ b/tests/tests/push-newpackage
@@ -2,23 +2,29 @@
 set -e
 . tests/lib
 
-t-archive-none pari-extra
-t-git-none
-t-worktree 3-1
-v=3-1
-cd $p
-git-branch -m dgit/sid master
-git-remote rm dgit
+t-prep-newpackage pari-extra 3-1
 
-LANG=C t-dgit push 2>&1 \
-	| tee /dev/stderr \
-	| grep 'package appears to be new in this suite' >/dev/null
+cd $p
+t-refs-same-start
+t-ref-head
 
-echo y
+t-expect-push-fail 'package appears to be new in this suite' \
+t-dgit push
 
 t-dgit build
+
+git checkout bogus
+
+set +e
+(set -e; DGIT_TEST_DEBUG=' ' t-dgit push --new)
+rc=$?
+set -e
+if [ $rc = 0 ]; then fail "push succeeded when tree mismatch"; fi
+
+git checkout master
+
 t-dgit push --new
 
-t-pushed-good
+t-pushed-good master
 
 echo ok.