chiark / gitweb /
Test suite: unapplied-pq2qc: leave us on the qc/ branch
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 10 Jul 2016 18:48:47 +0000 (19:48 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 15:47:48 +0000 (16:47 +0100)
The patch queue branch is not really very useful.  Certainly, the
build tests will require the patch queue branch.

tests/lib

index c51c4a6..dd7a67d 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -513,9 +513,9 @@ t-apply-diff () {
 }
 
 t-gbp-unapplied-pq2qc () {
-       # does `gbp pq export' (leaving us on BRANCH (eg "quilt-tip"))
+       # does `gbp pq export'
        # commits the resulting debian/patches on  qc/BRANCH
-       # goes back to patch-queue/BRANCH
+       # leaves us on qc/BRANCH (eg "qc/quilt-tip"))
        # qc/BRANCH is not fast-forwarding
 
        gbp pq export
@@ -531,7 +531,6 @@ t-gbp-unapplied-pq2qc () {
        git checkout qc/$branch
        git add debian/patches
        git commit -m 'Commit patch queue'
-       git checkout patch-queue/$branch
 }
 
 t-gbp-example-prep () {