git-debrebase: test suite: gdr-*: break out t-nmu-causes-ff-fail

[dgit.git] / tests / lib-gdr

diff --git a/tests/lib-gdr b/tests/lib-gdr
index d45759d778aec9f8b7941c56cca208340aee0e94..ac4a476ea3596ba34cd87f85c24b654a8c6d6889 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -202,3 +202,32 @@ 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
+
+       : 'check that what we have is what is expected'
+
+       git checkout -b compare.nmu origin/master~0
+       git checkout $nmutree .
+       git rm -rf debian/patches
+       git commit -m 'rm patches nmu'
+
+       git checkout -b compare.maintainer origin/master~0
+       git checkout did.maintainer .
+       git rm -rf --ignore-unmatch debian/patches
+       git commit --allow-empty -m 'rm patches maintainer'
+
+       git merge compare.nmu
+       git diff --quiet master
+
+       : 'check that dgit still likes it'
+
+       git checkout master
+       t-dgit -wgf quilt-fixup
+}