Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
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
t-dgit fetch
t-git-next-date
-t-expect-fail E:'Not.*fast-forward' \
-git merge --ff-only dgit/dgit/sid
+t-nmu-causes-ff-fail
: 'ad hocery'
t-dgit fetch
t-git-next-date
-t-expect-fail E:'Not.*fast-forward' \
-git merge --ff-only dgit/dgit/sid
+t-nmu-causes-ff-fail
: 'rebase nmu onto our branch'