test suite: initial git-debrebase setup attempts - bugfixes

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

diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr
index b2561018c6669f106b4714fbb5a5a975e82671cb..c4714e345159a3848b4ba24ca1b718bfa47ab3d3 100755 (executable)
--- a/tests/setup/gbp2gdr
+++ b/tests/setup/gbp2gdr
@@ -43,9 +43,10 @@ git checkout -b make-upstream upstream
 echo upstream-v2 >>docs/README
 git commit -a -m "an upstream v2 update"
 ust=example_2.0.orig.tar.gz
-git archive -o ../$ust --prefix=example-2.0/ upstream
+git archive -o ../$ust --prefix=example-2.0/ make-upstream
 
 : 'see what gbp import-orig does'
+git checkout quilt-tip
 gbp import-orig --debian-branch=quilt-tip --upstream-version=2.0 ../$ust
 
 not-gdr-processable