summaryrefslogtreecommitdiff
path: root/tests/lib-gdr
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-17 23:33:03 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 16:06:58 +0100
commitfe0439371d17132ccb6b7a00f1ee57c0576e44fc (patch)
treea1193a907ece5d4b9444521110a67499fa77d40f /tests/lib-gdr
parent70e4369aa8239f967f89d0972e964b8dc9b2e3b5 (diff)
git-debrebase: test suite: gdr-*: break out t-nmu-causes-ff-fail
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/lib-gdr')
-rw-r--r--tests/lib-gdr5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr
index da119bc..ac4a476 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -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