chiark / gitweb /
Test suite: t-gbp-example-prep-no-ff: break out from t-gbp-example-prep
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 18 Oct 2016 00:02:41 +0000 (01:02 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 18 Oct 2016 00:44:23 +0000 (01:44 +0100)
No functional change.

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

index 275d3ef..3ddb980 100644 (file)
--- 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' \