diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2023-09-02 11:23:15 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2023-09-02 11:25:39 +0100 |
commit | ea934e4b7845ab3841e744fd032792d56d86fabe (patch) | |
tree | 784d9462a9782e98974b9d488673848ed5ffa0e6 | |
parent | 9231189d61d5969fe8d8d2fff293b8ac0c0d4fab (diff) |
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>
-rwxr-xr-x | dgit | 2 | ||||
-rwxr-xr-x | tests/tests/dpkgsourceignores-correct | 2 | ||||
-rwxr-xr-x | tests/tests/gitworktree | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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 |