git-debrebase: test: use conventional branch names

[dgit.git] / tests / setup / gbp2gdr

diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr
index da238f4bdaeb8e34384e0715c90ff7da71b93523..8088e9830ae7ab3d5036a91a776002bebcbd3423 100755 (executable)
--- a/tests/setup/gbp2gdr
+++ b/tests/setup/gbp2gdr
@@ -3,7 +3,7 @@ set -e
 . tests/lib
 . $troot/lib-gdr
 
-t-dependencies git-buildpackage
+t-dependencies git-buildpackage libfile-fnmatch-perl
 
 t-tstunt-parsechangelog
 
@@ -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