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

diff --git a/tests/tests/push-newpackage b/tests/tests/push-newpackage
index 2d016572..030507f1 100755
--- a/tests/tests/push-newpackage
+++ b/tests/tests/push-newpackage
@@ -7,18 +7,30 @@ t-git-none
 t-worktree 3-1
 v=3-1
 cd $p
-git-branch -m dgit/sid master
-git-remote rm dgit
+git branch -m dgit/sid master
+git remote rm dgit
+
+t-refs-same-start
+t-ref-head
 
 LANG=C t-dgit push 2>&1 \
 	| tee /dev/stderr \
 	| grep 'package appears to be new in this suite' >/dev/null
 
-echo y
-
 t-dgit build
+
+git checkout bogus
+
+set +e
+(set -e; 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.