chiark / gitweb /
git-debrebase: test suite: gdr-*: break out t-nmu-causes-ff-fail
[dgit.git] / tests / lib-gdr
index f5ba302663263a6c9374459af44237f6984a73bc..594cd29183228b9465ad4334e86ad677da1b6bcf 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