git-debrebase: test suite: gdr nmu divergence: check that divergence check trips...

[dgit.git] / tests / lib-gdr

diff --git a/tests/lib-gdr b/tests/lib-gdr
index da119bca098ee1048250c7d7e419a21a6ef64eff..de365a2465e2a115553939f0d5b43f433eaa3c13 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -203,6 +203,16 @@ t-maintainer-commit-some-changes () {
        t-git-next-date
 }
 
+t-nmu-causes-ff-fail () {
+       t-dgit fetch
+
+       t-expect-fail E:'Not.*fast-forward' \
+       git merge --ff-only dgit/dgit/sid
+
+       t-expect-fail E:'-fdiverged.*refs/remotes/dgit/dgit/sid' \
+       t-git-debrebase
+}
+
 t-nmu-reconciled-good () {
        local nmutree=$1