From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 3 Aug 2014 17:02:13 +0000 (+0100)
Subject: Test mismatch during push
X-Git-Tag: debian/0.22~31
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=287a7f0fc2a71b5e4df36e9f1ecf9b05d0212a85;ds=sidebyside

Test mismatch during push
---

diff --git a/tests/tests/push-newpackage b/tests/tests/push-newpackage
index eea5685a..030507f1 100755
--- a/tests/tests/push-newpackage
+++ b/tests/tests/push-newpackage
@@ -18,6 +18,17 @@ LANG=C t-dgit push 2>&1 \
 	| grep 'package appears to be new in this suite' >/dev/null
 
 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 master
diff --git a/tests/worktrees/pari-extra_3-1.tar b/tests/worktrees/pari-extra_3-1.tar
index 115a7956..81a6a54a 100644
Binary files a/tests/worktrees/pari-extra_3-1.tar and b/tests/worktrees/pari-extra_3-1.tar differ