From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 31 Jul 2018 08:12:52 +0000 (+0100)
Subject: test suite: gdr-convert-gbp: Provide some unprocessable branches
X-Git-Tag: archive/debian/6.3~12
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=76a26a1e620f173b11a16e54ad424ed20f9bc116;p=dgit.git

test suite: gdr-convert-gbp: Provide some unprocessable branches

We'll add a test which uses these, in a moment.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index 6ec374df..b7e0b7d3 100755
--- a/tests/setup/gdr-convert-gbp
+++ b/tests/setup/gdr-convert-gbp
@@ -11,6 +11,7 @@ t-dependencies GDR
 t-tstunt-parsechangelog
 
 not-gdr-processable () {
+	git branch gdr-unprocessable/$1
 	t-git-debrebase analyse | grep 'Unknown Unprocessable'
 }
 
@@ -37,7 +38,7 @@ gbp pq export
 git add debian/patches
 git commit -m "patch queue update ($0)"
 
-not-gdr-processable
+not-gdr-processable origin
 
 : 'fake up an upstream 2.0'
 git branch make-upstream upstream
@@ -61,7 +62,7 @@ done
 git checkout master
 gbp import-orig --upstream-version=2.0 ../$ust
 
-not-gdr-processable
+not-gdr-processable merge
 
 t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)'
 t-dch-commit-r