X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fpush-newpackage;h=79355e3e4851014c665d697d0cfde8234b6c56f3;hb=318d5f52db221919a0ec31ab08cc525982c3bf56;hp=3dfe0b58fadaa137c2142f98a82af85059fb8a84;hpb=d064fe28e62e45dca47b9925eac285e7b7becc5d;p=dgit.git

diff --git a/tests/tests/push-newpackage b/tests/tests/push-newpackage
index 3dfe0b58..79355e3e 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 master
 
-echo ok.
+t-ok