chiark / gitweb /
git-debrebase: test suite: gdr-*: break out t-nmu-causes-ff-fail
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 17 Feb 2018 23:33:03 +0000 (23:33 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:06:58 +0000 (16:06 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/lib-gdr
tests/tests/gdr-diverge-nmu
tests/tests/gdr-diverge-nmu-dgit

index da119bc..ac4a476 100644 (file)
@@ -203,6 +203,11 @@ t-maintainer-commit-some-changes () {
        t-git-next-date
 }
 
+t-nmu-causes-ff-fail () {
+       t-expect-fail E:'Not.*fast-forward' \
+       git merge --ff-only dgit/dgit/sid
+}
+
 t-nmu-reconciled-good () {
        local nmutree=$1
 
index e647f80..8f0b9cb 100755 (executable)
@@ -31,8 +31,7 @@ t-maintainer-commit-some-changes
 t-dgit fetch
 t-git-next-date
 
-t-expect-fail E:'Not.*fast-forward' \
-git merge --ff-only dgit/dgit/sid
+t-nmu-causes-ff-fail
 
 : 'ad hocery'
 
index f7bf3d5..02fb2f7 100755 (executable)
@@ -35,8 +35,7 @@ t-maintainer-commit-some-changes
 t-dgit fetch
 t-git-next-date
 
-t-expect-fail E:'Not.*fast-forward' \
-git merge --ff-only dgit/dgit/sid
+t-nmu-causes-ff-fail
 
 : 'rebase nmu onto our branch'