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=e528567ffd93886b80c3d24995ff5768e5b2ee90;hpb=e677c4ae89b7391b60bca6aab582ccd99b4fa68b;p=dgit.git

diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index e528567f..21e396bc 100755
--- a/tests/tests/quilt-gbp
+++ b/tests/tests/quilt-gbp
@@ -4,44 +4,57 @@ set -e
 
 t-tstunt-parsechangelog
 
-t-newtag
-
 t-gbp-example-prep
 
 t-expect-fail 'quilt fixup cannot be linear' \
   t-dgit build-source
 
+t-git-config dgit-distro.test-dummy.dgit-tag-format new
+t-expect-fail 'requires split view so server needs to support' \
+t-dgit -wgf --quilt=gbp build-source
+t-newtag
+
 t-dgit --quilt=gbp build-source
 
-t-dgit --quilt=gbp --gbp=no-such-command-gbp build-source
+t-dgit --quilt=gbp --gbp-pq=no-such-command-gbp build-source
 
 echo spong >debian/pointless-for-dgit-test
 git add debian/pointless-for-dgit-test
 git commit -m Pointless
 
 t-expect-fail no-such-command-gbp \
-t-dgit --quilt=gbp --clean=git --gbp=no-such-command-gbp build-source
+t-dgit --quilt=gbp --clean=git --gbp-pq=no-such-command-gbp build-source
 
-t-dgit --quilt=gbp --clean=git build-source
+test-push-1 () {
+	t-refs-same-start
+	t-ref-head
+}
 
-t-expect-fail 'specifies a different tree to your HEAD commit' \
-  t-dgit push
+test-push-2 () {
+	t-dgit --quilt=gbp push
 
-t-refs-same-start
-t-ref-head
+	t-gbp-pushed-good
+}
 
-t-dgit --quilt=gbp push
+test-push-1
 
-t-gbp-pushed-good
+t-dgit --quilt=gbp --clean=git build-source
+
+t-expect-fail "HEAD specifies a different tree to $p" \
+  t-dgit push
 
-exit 0
+test-push-2
 
-===
+echo wombat >>debian/pointless-for-dgit-test
+git add debian/pointless-for-dgit-test
+git commit -m 'Pointless 2'
+
+t-commit 'Check pseudomerge' 1.0-3
 
-want to
+test-push-1
 
-make a new change
+t-dgit --quilt=gbp --clean=git build-source
 
-push it
+test-push-2
 
-check that the synthetic fast forward worked
+echo ok.