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

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index b4642ae89556a05fb38699635ac898d39af224bd..3ddb98051e85890572809e56172575275433e13f 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -21,6 +21,8 @@ END
 
 trap 'test $? = 0 || t-report-failure' EXIT
 
+t-filter-out-git-hyphen-dir
+
 t-set-intree
 
 : ${DGIT_TEST_DEBUG=-D}
@@ -776,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
@@ -786,7 +788,7 @@ t-gbp-example-prep () {
 
        t-dgit fetch
 
-       git-checkout -b patch-queue/quilt-tip-2 patch-queue/quilt-tip
+       git checkout -b patch-queue/quilt-tip-2 patch-queue/quilt-tip
        gbp pq rebase
 
        echo '/* some comment */' >>src.c
@@ -796,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' \