From 6193147fcaa5f003243e79eaf7ace4b4d5152fbf Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 11 Sep 2016 19:01:47 +0100 Subject: Split brain: Test suite: quilt-gbp: Test 2nd push (ie, test pseudomerge) Signed-off-by: Ian Jackson --- tests/tests/quilt-gbp | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'tests') diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp index e528567..2dc9b42 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 -- cgit v1.2.3