X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fquilt-gbp;h=ac8a42651b4abb0201c25895c785f466748928d5;hb=97c1a1ffc16df83859231c2c38c9118c9c2caac0;hp=d3624e9ee6f5183350b10a586c3beab2724513b1;hpb=44fa80787dee7a78629768a78041ded8c309addc;p=dgit.git

diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index d3624e9e..ac8a4265 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,24 +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
 
-===
+	t-dgit --quilt=gbp push
 
-want to
+	t-gbp-pushed-good
+}
 
- do push
- t-pushed-good
- check that
-   - we didn't update caller's branch
+test-push
 
- do fetch
- check that this didn't update dgit remote ref
+echo wombat >>debian/pointless-for-dgit-test
+git add debian/pointless-for-dgit-test
+git commit -m 'Pointless 2'
 
- check that Dgit hash in dsc refers to tree identical
- to dpkg-source -x
+t-commit 'Check pseudomerge' 1.0-3
+
+t-dgit --quilt=gbp --clean=git build-source
 
- check that that tree
-  - has patches applied (reuse rules build magic)
-  - has .gitignore edited
+test-push
 
+echo ok.