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.
+t-ok