From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 30 Jun 2019 10:00:22 +0000 (+0100)
Subject: test suite: baredebian: Break out baredebian-tarball-mode
X-Git-Tag: archive/debian/9.0~35
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=a49cc9d6a608f509e551bc954b24136bf48c33ba

test suite: baredebian: Break out baredebian-tarball-mode

No functional change.

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

diff --git a/tests/lib-baredebian b/tests/lib-baredebian
index 368aa78f..abec753a 100644
--- a/tests/lib-baredebian
+++ b/tests/lib-baredebian
@@ -8,6 +8,12 @@ baredebian-test-vars () {
 	uvtag=v$uv
 }
 
+baredebian-tarball-mode () {
+	git tag -d $uvtag
+	uvtag=''
+	quiltmode=baredebian+tarball
+}
+
 baredebian-test-core () {
 	t-expect-fail 'contradicts clean mode git-ff' \
 	t-dgit -wgf --dgit-view-save=split.f1 --$quiltmode quilt-fixup
diff --git a/tests/tests/baredebian-tarball b/tests/tests/baredebian-tarball
index 6b1a1b63..7acd7b7e 100755
--- a/tests/tests/baredebian-tarball
+++ b/tests/tests/baredebian-tarball
@@ -10,10 +10,7 @@ t-tstunt-parsechangelog
 
 cd $p
 baredebian-test-vars
-
-quiltmode=baredebian+tarball
-git tag -d $uvtag
-uvtag=''
+baredebian-tarball-mode
 
 t-expect-fail 'Could not determine appropriate upstream commitish' \
 t-dgit -wn --dgit-view-save=split.g --baredebian quilt-fixup