diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-18 01:02:41 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-18 01:44:23 +0100 |
commit | a56fc8384e1aaae7d279b74269b706156a6da962 (patch) | |
tree | f8807fd81daecb56f5aa3cbf09e28149e83746af /tests/lib | |
parent | 7c135b780c03d0d5abbcf7fec65062e84e68c551 (diff) |
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>
Diffstat (limited to 'tests/lib')
-rw-r--r-- | tests/lib | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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' \ |