From b8db6dd796d777be96e91d26c1b011d4e78b1f40 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 15 Feb 2018 16:14:04 +0000
Subject: [PATCH] git-debrebase: test: use conventional branch names

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 tests/setup/gbp2gdr | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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
 
-- 
2.30.2