From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 11 Sep 2016 18:01:47 +0000 (+0100)
Subject: Split brain: Test suite: quilt-gbp: Test 2nd push (ie, test pseudomerge)
X-Git-Tag: archive/debian/2.0~150
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=6193147fcaa5f003243e79eaf7ace4b4d5152fbf

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

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index e528567f..2dc9b420 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 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