Ian Jackson <[email protected]> writes: > Simon Josefsson writes ("Bug#1127666: how to recover from intermittent > SSH push.dgit.d.o issue?"): >> My reading of the man page is that --deliberately-not-fast-forward is >> the relevant parameter for this situation, but it fails (I'm still on >> 14.7~bpo13+1) when I try it now (fortunately for this bug report the >> package was REJECTED again so I got to retry this). > >> The package was REJECTED for copyright reasons and the man page says: > > Thanks for your careful approach. > > We may need to update the documentation. > > Did you in fact rewind history to no longer include the REJECT-worthy > material ?
No. Where is rewinding discussed? I see nothing relevant in dgit(1). What do you actually mean by "rewind history"? Is that a well-established term for anything specific? > I see that this package is on Salsa at > https://salsa.debian.org/go-team/packages/golang-filippo-nistec > > I assume that the REJECTed material is included in the history you're > publishing there ? Yes. The copyright REJECTs were because d/copyright had bugs, not because the content is undistributable. This seems like common scenario. > In which case it is fine to have it on dgit-repos too, just not your > Debianised package. Yeah, I don't see the point of force-pushing anything to Salsa to cover up my mistakes. >> I will hold off upload until I can retry with 14.8 to see if it >> behaves different. > > dgit 14.8 won't do anything meaningfully differnet, and neither will > the server software when we update it - the fixes are just to > messages, not to behaviour. > > So you may as well go ahead, but presumably we should finish this > conversation (and decide how to fix the docs!) first. I have tried with 14.8 now. Naive attempt: jas@frallan:~/dpkg/golang-filippo-nistec$ dgit push-built --new -Cgolang-filippo-nistec_0.0.4-3_amd64.changes Format `3.0 (quilt)', need to check/update patch stack canonical suite name for unstable is sid no version available from the archive nothing quilty to commit, ok. checking that golang-filippo-nistec_0.0.4-3.dsc corresponds to HEAD dpkg-source: varning: extraherar osignerat källkodspaket (/home/jas/dpkg/golang-filippo-nistec/../golang-filippo-nistec_0.0.4-3.dsc) dpkg-source: info: extraherar golang-filippo-nistec i unpacked dpkg-source: info: packar upp golang-filippo-nistec_0.0.4.orig.tar.gz dpkg-source: info: packar upp golang-filippo-nistec_0.0.4-3.debian.tar.xz History contains tainted commit 089445ef0355a294a39643e8f4d476fd88844fb5 Taint recorded at time 2026-02-11 00:43:10 Z for any package Reason: tag archive/debian/0.0.4-1 referred to this object in git tree but all previously pushed versions were found to have been removed from NEW (ie, rejected) (or never arrived) Could perhaps be forced using --deliberately-<something>. See dgit(1). History contains tainted commit 089445ef0355a294a39643e8f4d476fd88844fb5 Taint recorded at time 2026-02-11 00:43:10 Z for any package Reason: tag debian/0.0.4-1 referred to this object in git tree but all previously pushed versions were found to have been removed from NEW (ie, rejected) (or never arrived) Could perhaps be forced using --deliberately-<something>. See dgit(1). dgit: error: pushing tainted objects (which server would reject) ! Push failed, while preparing your push. ! You can retry the push, after fixing the problem, if you like. jas@frallan:~/dpkg/golang-filippo-nistec$ So a bit better error message, thank you! Let's follow what I did earlier: jas@frallan:~/dpkg/golang-filippo-nistec$ dgit push-built --new --deliberately-not-fast-forward -Cgolang-filippo-nistec_0.0.4-3_amd64.changes Format `3.0 (quilt)', need to check/update patch stack canonical suite name for unstable is sid no version available from the archive nothing quilty to commit, ok. checking that golang-filippo-nistec_0.0.4-3.dsc corresponds to HEAD dpkg-source: varning: extraherar osignerat källkodspaket (/home/jas/dpkg/golang-filippo-nistec/../golang-filippo-nistec_0.0.4-3.dsc) dpkg-source: info: extraherar golang-filippo-nistec i unpacked dpkg-source: info: packar upp golang-filippo-nistec_0.0.4.orig.tar.gz dpkg-source: info: packar upp golang-filippo-nistec_0.0.4-3.debian.tar.xz History contains tainted commit 089445ef0355a294a39643e8f4d476fd88844fb5 Taint recorded at time 2026-02-11 00:43:10 Z for any package Reason: tag archive/debian/0.0.4-1 referred to this object in git tree but all previously pushed versions were found to have been removed from NEW (ie, rejected) (or never arrived) Could perhaps be forced using --deliberately-<something>. See dgit(1). History contains tainted commit 089445ef0355a294a39643e8f4d476fd88844fb5 Taint recorded at time 2026-02-11 00:43:10 Z for any package Reason: tag debian/0.0.4-1 referred to this object in git tree but all previously pushed versions were found to have been removed from NEW (ie, rejected) (or never arrived) Could perhaps be forced using --deliberately-<something>. See dgit(1). dgit: error: pushing tainted objects (which server would reject) ! Push failed, while preparing your push. ! You can retry the push, after fixing the problem, if you like. jas@frallan:~/dpkg/golang-filippo-nistec$ I can't say that I understand what happened, or why that didn't work, but I changed approach: jas@frallan:~/dpkg/golang-filippo-nistec$ dgit push-built --new --deliberately-include-questionable-history -Cgolang-filippo-nistec_0.0.4-3_amd64.changes Format `3.0 (quilt)', need to check/update patch stack canonical suite name for unstable is sid no version available from the archive nothing quilty to commit, ok. checking that golang-filippo-nistec_0.0.4-3.dsc corresponds to HEAD dpkg-source: varning: extraherar osignerat källkodspaket (/home/jas/dpkg/golang-filippo-nistec/../golang-filippo-nistec_0.0.4-3.dsc) dpkg-source: info: extraherar golang-filippo-nistec i unpacked dpkg-source: info: packar upp golang-filippo-nistec_0.0.4.orig.tar.gz dpkg-source: info: packar upp golang-filippo-nistec_0.0.4-3.debian.tar.xz ../golang-filippo-nistec_0.0.4-3_amd64.changes already has appropriate .orig(s) (if any) gpg: VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering gpg: WARNING: server 'gpg-agent' is older than us (2.4.7 < 2.4.8) gpg: Note: Outdated servers may lack important security fixes. gpg: Note: Use the command "gpgconf --kill all" to restart them. gpg: VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering gpg: WARNING: server 'gpg-agent' is older than us (2.4.7 < 2.4.8) gpg: Note: Outdated servers may lack important security fixes. gpg: Note: Use the command "gpgconf --kill all" to restart them. gpg: Signatur gjord sön 15 feb 2026 21:56:37 CET gpg: med EDDSA-nyckeln A3CC9C870B9D310ABAD4CF2F51722B08FE4745A2 gpg: issuer "[email protected]" gpg: Korrekt signatur från "Simon Josefsson <[email protected]>" [förbehållslös] gpg: Signatur gjord sön 15 feb 2026 21:56:37 CET gpg: med EDDSA-nyckeln A3CC9C870B9D310ABAD4CF2F51722B08FE4745A2 gpg: issuer "[email protected]" gpg: Korrekt signatur från "Simon Josefsson <[email protected]>" [förbehållslös] varning: Du verkar ha klonat ett tomt arkiv. Räknar upp objekt: 1221, klart. Räknar objekt: 100% (1221/1221), klart. Deltakomprimering använder upp till 24 trådar Komprimerar objekt: 100% (356/356), klart. Skriver objekt: 100% (1221/1221), 1,10 MiB | 225,36 MiB/s, klart. Totalt 1221 (delta 649), återanvände 1169 (delta 615), paket-återanvända 0 (från 0) remote: Analyserar delta: 100% (649/649), klart. remote: To /srv/dgit.debian.org/dispatch-dir/distro=debian/repos/_tmp/golang-filippo-nistec_prospective remote: * [new reference] cb29ed950a89fb3cb77ef97487812cc25c73dfb1 -> refs/dgit/sid remote: * [new tag] 3f5b8c87f00b3a78ca8a154b312382a0443274d4 -> archive/debian/0.0.4-3 remote: * [new tag] 1f2a2966b81dd60e9d6e52f98fc47ad24a3345d8 -> debian/0.0.4-3 remote: To /srv/dgit.debian.org/dispatch-dir/distro=debian/repos/_tmp/golang-filippo-nistec_prospective remote: * [new branch] cb29ed950a89fb3cb77ef97487812cc25c73dfb1 -> master remote: remote: History contains tainted commit 089445ef0355a294a39643e8f4d476fd88844fb5 remote: Taint recorded at time 2026-02-11 00:43:10 Z for package golang-filippo-nistec remote: Reason: tag archive/debian/0.0.4-1 referred to this object in git tree but all previously pushed versions were found to have been removed from NEW (ie, rejected) (or never arrived) remote: Uncorrectable error. If confused, consult administrator. remote: remote: History contains tainted commit 089445ef0355a294a39643e8f4d476fd88844fb5 remote: Taint recorded at time 2026-02-11 00:43:10 Z for package golang-filippo-nistec remote: Reason: tag debian/0.0.4-1 referred to this object in git tree but all previously pushed versions were found to have been removed from NEW (ie, rejected) (or never arrived) remote: Uncorrectable error. If confused, consult administrator. To git+ssh://push.dgit.debian.org/dgit/debian/repos/golang-filippo-nistec.git * [new reference] cb29ed950a89fb3cb77ef97487812cc25c73dfb1 -> refs/dgit/sid * [new tag] archive/debian/0.0.4-3 -> archive/debian/0.0.4-3 * [new tag] debian/0.0.4-3 -> debian/0.0.4-3 signfile dsc ../golang-filippo-nistec_0.0.4-3.dsc Simon Josefsson <[email protected]> gpg: VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering gpg: WARNING: server 'gpg-agent' is older than us (2.4.7 < 2.4.8) gpg: Note: Outdated servers may lack important security fixes. gpg: Note: Use the command "gpgconf --kill all" to restart them. fixup_buildinfo ../golang-filippo-nistec_0.0.4-3.dsc ../golang-filippo-nistec_0.0.4-3_amd64.buildinfo signfile buildinfo ../golang-filippo-nistec_0.0.4-3_amd64.buildinfo Simon Josefsson <[email protected]> gpg: VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering gpg: WARNING: server 'gpg-agent' is older than us (2.4.7 < 2.4.8) gpg: Note: Outdated servers may lack important security fixes. gpg: Note: Use the command "gpgconf --kill all" to restart them. fixup_changes dsc ../golang-filippo-nistec_0.0.4-3.dsc ../golang-filippo-nistec_0.0.4-3_amd64.changes fixup_changes buildinfo ../golang-filippo-nistec_0.0.4-3_amd64.buildinfo ../golang-filippo-nistec_0.0.4-3_amd64.changes signfile changes ../golang-filippo-nistec_0.0.4-3_amd64.changes Simon Josefsson <[email protected]> gpg: VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering gpg: WARNING: server 'gpg-agent' is older than us (2.4.7 < 2.4.8) gpg: Note: Outdated servers may lack important security fixes. gpg: Note: Use the command "gpgconf --kill all" to restart them. Successfully signed dsc, buildinfo, changes files Uploading golang-filippo-nistec using ftp to ftp-master (host: ftp.upload.debian.org; directory: /pub/UploadQueue/) running allowed-distribution: check whether a local profile permits uploads to the target distribution running protected-distribution: warn before uploading to distributions where a special policy applies running checksum: verify checksums before uploading running suite-mismatch: check the target distribution for common errors running gpg: check GnuPG signatures before the upload Uploading golang-filippo-nistec_0.0.4-3.dsc Uploading golang-filippo-nistec_0.0.4.orig.tar.gz Uploading golang-filippo-nistec_0.0.4-3.debian.tar.xz Uploading golang-filippo-nistec-dev_0.0.4-3_all.deb Uploading golang-filippo-nistec_0.0.4-3_amd64.buildinfo Uploading golang-filippo-nistec_0.0.4-3_amd64.changes dgit ok: pushed and uploaded 0.0.4-3 jas@frallan:~/dpkg/golang-filippo-nistec$ I'm not sure if I should hope for ACCEPT or REJECT now... /Simon
signature.asc
Description: PGP signature
