X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fquilt-gbp;h=ac8a42651b4abb0201c25895c785f466748928d5;hp=e528567ffd93886b80c3d24995ff5768e5b2ee90;hb=3b50d1e6ab010dcf9924121d2e3c1f7732dd1f4b;hpb=e677c4ae89b7391b60bca6aab582ccd99b4fa68b

diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index e528567f..ac8a4265 100755
--- a/tests/tests/quilt-gbp
+++ b/tests/tests/quilt-gbp
@@ -27,21 +27,25 @@ t-dgit --quilt=gbp --clean=git build-source
 t-expect-fail 'specifies a different tree to your HEAD commit' \
   t-dgit push
 
-t-refs-same-start
-t-ref-head
+test-push () {
+	t-refs-same-start
+	t-ref-head
 
-t-dgit --quilt=gbp push
+	t-dgit --quilt=gbp push
 
-t-gbp-pushed-good
+	t-gbp-pushed-good
+}
 
-exit 0
+test-push
 
-===
+echo wombat >>debian/pointless-for-dgit-test
+git add debian/pointless-for-dgit-test
+git commit -m 'Pointless 2'
 
-want to
+t-commit 'Check pseudomerge' 1.0-3
 
-make a new change
+t-dgit --quilt=gbp --clean=git build-source
 
-push it
+test-push
 
-check that the synthetic fast forward worked
+echo ok.