X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fforcesplit-overwrite;h=9600d3a8887d1d424e4b65e1562fc2172c82db2c;hb=a524278af9976ba81539b11a84350922625c7494;hp=d07d65a0d80cf8f9e4d1ecdc81a58d56d3cab5a2;hpb=16f71c0bfd026cafacd9a5fad1404e457ae55b78;p=dgit.git

diff --git a/tests/tests/forcesplit-overwrite b/tests/tests/forcesplit-overwrite
index d07d65a0..9600d3a8 100755
--- a/tests/tests/forcesplit-overwrite
+++ b/tests/tests/forcesplit-overwrite
@@ -17,7 +17,18 @@ t-commit 'No changes, just send to stable' '' stable
 t-refs-same-start
 t-ref-head
 
-t-dgit -wgf --split-view --overwrite=1.2 --dgit-view-save=split.p push-source stable
+try () {
+	t-dgit -wgf --split-view "$@" --dgit-view-save=split.p \
+		push-source stable
+}
+
+t-expect-fail E:'maintainer view tag.*not fast forward' \
+try
+
+t-expect-fail F:'debian/changelog does not mention 1.2' \
+try --overwrite
+
+try --overwrite=1.2
 git branch -f split.b split.p
 
 t-ref-head