git-debrebase: Replace several `git-debrebase:' with `$us:'

[dgit.git] / tests / lib-gdr

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 9ea5af51bcacbbe1f885d0535bdb02339183b6f3..cda11df5b8d5fe7d322d9f8f8168cc44c2554746 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -3,6 +3,8 @@
 : ${GDR_TEST_DEBUG=-D}
 export GDR_TEST_DEBUG
 
+t-tstunt debchange
+
 t-git-debrebase () {
        local gdr=${DGIT_GITDEBREBASE_TEST-git-debrebase}
        : '
@@ -21,6 +23,12 @@ t-gdr-good () {
        #   stitched
        #   pushed
 
+       case $state in
+       pushed*)
+               t-gdr-made-patches
+               ;;
+       esac
+
        git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
 
        LC_MESSAGES=C t-git-debrebase status >../status.check
@@ -221,11 +229,9 @@ t-some-changes () {
 t-make-new-upstream-tarball () {
        local uv=$1
        git checkout make-upstream
-       # leaves ust set to filename of orig tarball
        echo "upstream $uv" >>docs/README
        git commit -a -m "upstream $uv tarball"
-       ust=example_$uv.orig.tar.gz
-       git archive -o ../$ust --prefix=example-2.0/ make-upstream
+       t-make-orig example $uv make-upstream
 }
 
 t-nmu-upload-1 () {
@@ -345,6 +351,10 @@ t-gdr-gbp-import-core () {
        git add debian
        git commit -m "an upstream retcon ($0)"
        git tag v1.0
+}
+
+t-gdr-gbp-import-core-with-queue () {
+       t-gdr-gbp-import-core
 
        : 'fake up that our quilt-tip was descended from upstream'
        git checkout quilt-tip
@@ -360,3 +370,8 @@ t-gdr-gbp-import-core () {
        git branch -D master
        git branch -m quilt-tip master
 }
+
+t-gdr-made-patches () {
+       git log -n1 --'pretty=format:%B' \
+       | egrep '^\[git-debrebase'
+}