X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-gdr;h=0fc55e3ec09cd8665b34ee148a9b0493aedc220a;hb=51a8006237f3882101297df7b5c29f2d15a7641e;hp=ac4a476ea3596ba34cd87f85c24b654a8c6d6889;hpb=fe0439371d17132ccb6b7a00f1ee57c0576e44fc;p=dgit.git diff --git a/tests/lib-gdr b/tests/lib-gdr index ac4a476e..0fc55e3e 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -204,6 +204,8 @@ t-maintainer-commit-some-changes () { } t-nmu-causes-ff-fail () { + t-dgit fetch + t-expect-fail E:'Not.*fast-forward' \ git merge --ff-only dgit/dgit/sid }