X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Fsetup%2Fgbp2gdr;fp=tests%2Fsetup%2Fgbp2gdr;h=8088e9830ae7ab3d5036a91a776002bebcbd3423;hb=b8db6dd796d777be96e91d26c1b011d4e78b1f40;hp=3f6d9a60f136ef42a2ff6e7435e0495b4052da5d;hpb=8618ddfd0724f66e260e50f0b4dc39a8d85be220;p=dgit.git

diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr
index 3f6d9a60..8088e983 100755
--- a/tests/setup/gbp2gdr
+++ b/tests/setup/gbp2gdr
@@ -45,9 +45,13 @@ git commit -a -m "an upstream v2 update"
 ust=example_2.0.orig.tar.gz
 git archive -o ../$ust --prefix=example-2.0/ make-upstream
 
+: 'make branch names more conventional'
+git branch -D master
+git branch -m quilt-tip master
+
 : 'see what gbp import-orig does'
-git checkout quilt-tip
-gbp import-orig --debian-branch=quilt-tip --upstream-version=2.0 ../$ust
+git checkout master
+gbp import-orig --upstream-version=2.0 ../$ust
 
 not-gdr-processable