dgit: Prevent pushing old versions (prep)

Allow (but ignore) the --force option we're going to use.

Apply it to two tests which play a bit fast and loose,
(ie, which omit calls to dch to update the changelog version.)

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

3 files changed, 3 insertions, 3 deletions

diff --git a/dgit b/dgit
index 5414209..a3b14a0 100755
--- a/dgit
+++ b/dgit
@@ -103,7 +103,7 @@ our $chase_dsc_distro=1;
 our %forceopts = map { $_=>0 }
     qw(unrepresentable unsupported-source-format
        dsc-changes-mismatch changes-origs-exactly
-       uploading-binaries uploading-source-only
+       uploading-binaries uploading-old-version uploading-source-only
        reusing-version
        push-tainted
        import-gitapply-absurd
diff --git a/tests/tests/dpkgsourceignores-correct b/tests/tests/dpkgsourceignores-correct
index f71c3a4..f3d70fa 100755
--- a/tests/tests/dpkgsourceignores-correct
+++ b/tests/tests/dpkgsourceignores-correct
@@ -48,6 +48,6 @@ git add .
 git commit -m 'want these'
 
 t-dgit --quilt=smash -wgf build-source
-t-dgit -wgf push-built
+t-dgit --force-uploading-old-version -wgf push-built
 
 t-ok
diff --git a/tests/tests/gitworktree b/tests/tests/gitworktree
index e0f0e0d..e8963b7 100755
--- a/tests/tests/gitworktree
+++ b/tests/tests/gitworktree
@@ -22,6 +22,6 @@ git add modification
 git commit -m 'want this'
 t-dgit -wgf quilt-fixup
 
-t-dgit -wgf --quilt=nofix push-source
+t-dgit -wgf --quilt=nofix push-source --force-uploading-old-version
 
 t-ok