X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=3ddb98051e85890572809e56172575275433e13f;hb=70dbab26df688289afccf257188267afb3594d16;hp=275d3ef3f2824e89dc64453f41a106d133f5619d;hpb=a85458a7fc736f6d404622a427380a41f1248765;p=dgit.git

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' \