From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 10 Jul 2016 18:48:47 +0000 (+0100)
Subject: Test suite: unapplied-pq2qc: leave us on the qc/ branch
X-Git-Tag: archive/debian/2.0~279
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0d6cdd1cec853a132aacc3f52c1cb7c585e02da5;p=dgit.git

Test suite: unapplied-pq2qc: leave us on the qc/ branch

The patch queue branch is not really very useful.  Certainly, the
build tests will require the patch queue branch.
---

diff --git a/tests/lib b/tests/lib
index c51c4a61..dd7a67dd 100644
--- 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 () {