From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 10 Feb 2018 11:37:55 +0000 (+0000)
Subject: test suite: initial git-debrebase setup attempts - bugfixes
X-Git-Tag: archive/debian/5.0~264
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=98f0b776adea78bc0f4c379a8e956a3cb69046ae;p=dgit.git

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 b2561018..c4714e34 100755
--- 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