chiark / gitweb /
git-debrebase: test suite: gdr nmu divergence: check that divergence check trips...
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 18 Feb 2018 00:15:49 +0000 (00:15 +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-edits

index 0fc55e3..de365a2 100644 (file)
@@ -208,6 +208,9 @@ t-nmu-causes-ff-fail () {
 
        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 () {
index cb2e471..70db713 100755 (executable)
@@ -29,7 +29,4 @@ t-gdr-good stitched
 t-dgit push-source
 t-gdr-good pushed
 
-: todo 'more tests: other maint updated, we must fetch'
-: todo 'more tests: other maint updated, alert divergence'
-
 t-ok