X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fquilt-gbp;h=2dc9b420e3bd3ab47ddb2bc46744661e268fa027;hp=da27d1447ca969eb702267cdc4e06033a849ccca;hb=6193147fcaa5f003243e79eaf7ace4b4d5152fbf;hpb=5a25026a936fed50c4ad1dd06b5fc57f3fe9c2c0;ds=inline

diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index da27d144..2dc9b420 100755
--- a/tests/tests/quilt-gbp
+++ b/tests/tests/quilt-gbp
@@ -2,6 +2,10 @@
 set -e
 . tests/lib
 
+t-tstunt-parsechangelog
+
+t-newtag
+
 t-gbp-example-prep
 
 t-expect-fail 'quilt fixup cannot be linear' \
@@ -23,30 +27,25 @@ t-dgit --quilt=gbp --clean=git build-source
 t-expect-fail 'specifies a different tree to your HEAD commit' \
   t-dgit push
 
-exit 0
-
-===
+test-push () {
+	t-refs-same-start
+	t-ref-head
 
-want to
+	t-dgit --quilt=gbp push
 
- do push
- t-pushed-good XXX need to do something more subtle than check our branch is in repo now
+	t-gbp-pushed-good
+}
 
- check that
-   - we didn't update caller's branch
+test-push
 
- do fetch
- check that this didn't update dgit remote ref
-
- check that Dgit hash in dsc refers to tree identical
- to dpkg-source -x
+echo wombat >>debian/pointless-for-dgit-test
+git add debian/pointless-for-dgit-test
+git commit -m 'Pointless 2'
 
- check that that tree
-  - has patches applied (reuse rules build magic)
-  - has .gitignore edited
+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