From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 18 Oct 2016 00:02:41 +0000 (+0100)
Subject: Test suite: t-gbp-example-prep-no-ff: break out from t-gbp-example-prep
X-Git-Tag: debian/2.3~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=a56fc8384e1aaae7d279b74269b706156a6da962

Test suite: t-gbp-example-prep-no-ff: break out from t-gbp-example-prep

No functional change.

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

diff --git a/tests/lib b/tests/lib
index 275d3ef3..3ddb9805 100644
--- a/tests/lib
+++ b/tests/lib
@@ -778,7 +778,7 @@ t-git-pseudo-merge () {
 	git merge $git_pseuomerge_opts "$@"
 }
 
-t-gbp-example-prep () {
+t-gbp-example-prep-no-ff () {
 	t-tstunt-parsechangelog
 	t-archive example 1.0-1
 	t-git-none
@@ -798,6 +798,10 @@ t-gbp-example-prep () {
 	t-gbp-unapplied-pq2qc
 
 	t-commit 'some updates' 1.0-2
+}
+
+t-gbp-example-prep () {
+	t-gbp-example-prep-no-ff
 
 	t-git-pseudo-merge \
 		-m 'Pseudo-merge to make descendant of archive' \