summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-15 16:14:04 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 12:25:49 +0100
commitb8db6dd796d777be96e91d26c1b011d4e78b1f40 (patch)
treeb782632c00ce3870af1dec988214a14979a98613 /tests
parent8618ddfd0724f66e260e50f0b4dc39a8d85be220 (diff)
git-debrebase: test: use conventional branch names
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/setup/gbp2gdr8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr
index 3f6d9a6..8088e98 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