From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Feb 2018 22:15:28 +0000 (+0000)
Subject: git-debrebase: test suite: introduce t-make-new-upstream-tarball
X-Git-Tag: archive/debian/5.0~194
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=4cffe29436a86c6aa974db00201cabae1448e0c7

git-debrebase: test suite: introduce t-make-new-upstream-tarball

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

diff --git a/tests/lib-gdr b/tests/lib-gdr
index ed55ecf4..74c571ab 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -108,3 +108,13 @@ t-some-changes () {
 	done
 	git commit -m "MIXED add both ($token)"
 }
+
+t-make-new-upstream-tarball () {
+	local uv=$1
+	git checkout make-upstream
+	# leaves ust set to filename of orig tarball
+	echo "upstream $uv" >>docs/README
+	git commit -a -m "upstream $uv tarball"
+	ust=example_$uv.orig.tar.gz
+	git archive -o ../$ust --prefix=example-2.0/ make-upstream
+}
diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr
index 2dbb5154..ac949dfa 100755
--- a/tests/setup/gbp2gdr
+++ b/tests/setup/gbp2gdr
@@ -37,11 +37,8 @@ git commit -m "patch queue update ($0)"
 not-gdr-processable
 
 : 'fake up an upstream 2.0'
-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/ make-upstream
+git branch make-upstream upstream
+t-make-new-upstream-tarball 2.0
 
 : 'make branch names more conventional'
 git branch -D master