Split brain: Test suite: quilt-gbp: Test 2nd push (ie, test pseudomerge)

[dgit.git] / tests / tests / quilt-gbp

diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index e528567ffd93886b80c3d24995ff5768e5b2ee90..2dc9b420e3bd3ab47ddb2bc46744661e268fa027 100755 (executable)
--- 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 psuedomerge' 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
+exit 0