X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fquilt-gbp;h=2dc9b420e3bd3ab47ddb2bc46744661e268fa027;hb=a76f225dd9f40fb964058702a88a30ddffb17b23;hp=271ea2c71c1b34ab9064c57fdfd104e963795db2;hpb=19d8ae7e56d6257e2bb925d0a6f2d7f4329a4523;p=dgit.git

diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index 271ea2c7..2dc9b420 100755
--- a/tests/tests/quilt-gbp
+++ b/tests/tests/quilt-gbp
@@ -4,6 +4,8 @@ set -e
 
 t-tstunt-parsechangelog
 
+t-newtag
+
 t-gbp-example-prep
 
 t-expect-fail 'quilt fixup cannot be linear' \
@@ -25,39 +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
-
-t-dgit --quilt=gbp push
+test-push () {
+	t-refs-same-start
+	t-ref-head
 
-t-ref-head
-
-exit 0
+	t-dgit --quilt=gbp push
 
-===
+	t-gbp-pushed-good
+}
 
-want to
+test-push
 
- t-pushed-good XXX need to do something more subtle than check our branch is in repo now:
+echo wombat >>debian/pointless-for-dgit-test
+git add debian/pointless-for-dgit-test
+git commit -m 'Pointless 2'
 
-    # check that:
-    # working tree is still clean
-    # DEP-14 tag refers to our HEAD, unchanged
-    # New dgit tag refers to a descendant
-    # New dgit tag and archive tag and .dsc hash are same
-    # dgit tree can be made by
-    #    - dpkg-source -x on the pushed .dsc
-    #    - modulo .pc
-    # Maintainer tree can be made by
-    #    - dpkg-source -x --skip-patches on the pushed .dsc
-    #    - deleting any auto-gitignore patch and removing it from series
-    #    - modulo .pc
-    # dgit tree can be made by
-    #    - as above, and then dpkg-source --before-build
-    #    - modulo .pc and non-debian/ .gitignores
+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