test suite: Add --force-reusing-version to many tests

This is going to be needed in a moment.  Unknown --force options are
harmless and just generate warnings, so we do this in advance.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

1 files changed, 6 insertions, 4 deletions

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 1fa6751..af02ac1 100755
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -57,7 +57,8 @@ t-git-dir-check enoent
 
 vanished=$v
 
-t-dgit push --new --deliberately-include-questionable-history
+t-dgit push --new --deliberately-include-questionable-history \
+	--force-reusing-version
 t-git-dir-check secret
 
 t-policy-periodic
@@ -81,7 +82,7 @@ t-expect-push-fail \
     "Package is in NEW and has not been accepted or rejected yet" \
 t-dgit --deliberately-TEST-dgit-only-not-fast-forward push
 
-t-dgit --deliberately-not-fast-forward push
+t-dgit --deliberately-not-fast-forward --force-reusing-version push
 
 cd $dgitrepo
 t-expect-push-fail "Not a valid object name" \
@@ -94,7 +95,8 @@ t-expect-push-fail \
     "Package is in NEW and has not been accepted or rejected yet" \
 t-dgit push
 
-t-dgit push --deliberately-include-questionable-history
+t-dgit push --deliberately-include-questionable-history \
+	--force-reusing-version
 
 t-archive-process-incoming sid
 
@@ -116,6 +118,6 @@ t-dgit pull
 t-dgit build
 t-expect-push-fail \
     'Reason: rewound suite sid; --deliberately-not-fast-forward specified' \
-t-dgit push
+t-dgit --force-reusing-version push
 
 t-ok