X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fquilt-gbp;h=21e396bc42bbcc9d04502942fd38d47c777d7696;hb=5dfc6a96cc69cd63ba7ff3be90d909391cf717b3;hp=23083a7667d4144d6b271de106cf86149d38dd52;hpb=9d2b2161c18c031a96bc2ba3b8e749f2cc44fc23;p=dgit.git

diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index 23083a76..21e396bc 100755
--- a/tests/tests/quilt-gbp
+++ b/tests/tests/quilt-gbp
@@ -25,21 +25,25 @@ git commit -m Pointless
 t-expect-fail no-such-command-gbp \
 t-dgit --quilt=gbp --clean=git --gbp-pq=no-such-command-gbp build-source
 
-t-dgit --quilt=gbp --clean=git build-source
-
-t-expect-fail 'specifies a different tree to your HEAD commit' \
-  t-dgit push
-
-test-push () {
+test-push-1 () {
 	t-refs-same-start
 	t-ref-head
+}
 
+test-push-2 () {
 	t-dgit --quilt=gbp push
 
 	t-gbp-pushed-good
 }
 
-test-push
+test-push-1
+
+t-dgit --quilt=gbp --clean=git build-source
+
+t-expect-fail "HEAD specifies a different tree to $p" \
+  t-dgit push
+
+test-push-2
 
 echo wombat >>debian/pointless-for-dgit-test
 git add debian/pointless-for-dgit-test
@@ -47,8 +51,10 @@ git commit -m 'Pointless 2'
 
 t-commit 'Check pseudomerge' 1.0-3
 
+test-push-1
+
 t-dgit --quilt=gbp --clean=git build-source
 
-test-push
+test-push-2
 
 echo ok.