vcswatch reports that
this package seems to have a new changelog entry (version
12.10~, distribution
unstable) and new commits
in its VCS. You should consider whether it's time to make
an upload.
Here are the relevant commit messages:
commit 9d508ed1be1a0648336f8f359d02a0be4e2b2060
Merge: b2ff873b e87e4843
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue Mar 25 00:39:04 2025 +0000
Merge branch 'gdr-merge-2' into 'master'
git-debrebase: Enable merge resolution unconditionally
See merge request dgit-team/dgit!162
commit e87e484373686e2002af0f7ca9289bfa0285ae6c
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon Mar 24 19:01:54 2025 +0000
git-debrebase: Fix docs ref on failed general merge resolution
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit f4934f9469ee434b15b03bb2c03216b1f93aa590
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon Mar 24 19:06:13 2025 +0000
git-debrebase(7): Document to file a bug on irresolvable general merges
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit f3971976e70e2af3a4dbf624215d992ebed95de7
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon Mar 24 19:01:37 2025 +0000
git-debrebase: Turn on --experimental-merge-resolution unconditionally
Rationale: without this the user gets an error.
With it, they will very likely get it all sorted out automatically.
There are several checks which should ensure that the result is right
if it seemed to work.
Or if the user is unlucky, they may get an error, in which case
they're no worse off.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit 0cdc8a40a460087acc3363fa428cec31f50fb4f6
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon Mar 24 18:58:47 2025 +0000
git-debrebase: Rename undocumented record merge resolution subcommand
Rename record-resolved-merge to record-resolved-merge-experimental.
We don't want anyone trying to run this. Its name needs giving to
something actually useable.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit b2ff873b449f7a7244ea2d288f37e59c65328e32
Merge: 2686dbcf 189ef7c5
Author: Sean Whitton <spwhitton@spwhitton.name>
Date: Mon Mar 24 03:01:22 2025 +0000
Merge branch 'dput' into 'master'
t2u d-r-s: Pass -u to dput (unconditionally)
Closes #65
See merge request dgit-team/dgit!159
commit 189ef7c5b068264aa603d69de3b03dd9888437f2
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun Mar 23 12:27:33 2025 +0000
t2u d-r-s: Pass -u to dput (unconditionally)
Fixes #65.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit 2686dbcfef19de406d3fc7620a5dafbb2aa8fa0d
Merge: da6eac57 e5e732c3
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat Mar 22 23:30:16 2025 +0000
Merge branch 'putative-source-protocol' into 'master'
t2u o2m: Describe protocol version 4, with source package name
See merge request dgit-team/dgit!157
commit e5e732c3d760ff28a60566270b87ed6e272e30c0
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat Mar 22 10:12:47 2025 +0000
t2u o2m: Describe protocol version 4, with source package name
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit da6eac578647388d3e13c0d0ecf35a2995f49f47
Merge: 9bcd010c 91143660
Author: Sean Whitton <spwhitton@spwhitton.name>
Date: Sat Mar 22 09:11:57 2025 +0000
Merge branch 'fidelity' into 'master'
t2u: Speak o2m protocol version 3, with worker fidelity
Closes #59
See merge request dgit-team/dgit!156
commit 91143660d00d94d8b51d49cc617e5fc53f4ea473
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri Mar 21 19:49:52 2025 +0000
t2u: tag2upload-oracled: Speak protocol v3, send fidelity
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit b59bc0f2b554badff180e435e1ffeed072d95f3d
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri Mar 21 19:48:38 2025 +0000
t2u: tag2upload-oracled: Break out $production_string
We're going to need this for the protocol.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit baab0ab9e5e6d8804f1b2e8326dceac68ba3ab09
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri Mar 21 19:47:08 2025 +0000
t2u: tests: t2u-integration: Pass --force-production to oracled
We'll need this or the manager won't give us jobs.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit 9bcd010c4d8b3b95b7be44585a3b8d49f644a927
Merge: bb24f62b 9c3a18d0
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu Mar 20 13:52:46 2025 +0000
Merge branch 't2u-key' into 'master'
dgit-ssh-dispatch: Expect a tag2upload public keyring
See merge request dgit-team/dgit!155
commit 9c3a18d00f21a7ac27457aaa66bad87d1ca9c1c8
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu Mar 20 11:57:38 2025 +0000
tests: Remove t2u oracle key from dd.gpg
Now we have and use t2uokr.gpg instead.
The actual live t2u key isn't in dd.gpg - it's separately configured.
So, in the tests, simulate the way gideon is set up,
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit 1863a5d20948943290e878de4b8a9e257461491f
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu Mar 20 12:15:21 2025 +0000
tests: t-drs: Provision the t2uokr.gpg keyring
Copy it into $tmp, and into the dispatch-dir, so that it will be used.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit 97bcc1b155090b5e4e1bd280918e4e0723c9160f
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu Mar 20 11:48:18 2025 +0000
tests: gnupg setup: Provide a t2uokr.gpg keyring with the test oracle key
$ GNUPGHOME=tests/gnupg-t2uo gpg --export 52400D7C6342821C0D2B588E108F924D8FECF890 >tests/gnupg/t2uokr.gpg
gpg: WARNING: unsafe permissions on homedir '/home/ian/things/Dgit/dgit/tests/gnupg-t2uo'
$
And commit (only) tests/gnupg/t2uokr.gpg.
This doesn't provision the key into test cases yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit 0bb17d5d5ee3642f26a55e00af4f04d337a61d38
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu Mar 20 11:41:23 2025 +0000
dgit-ssh-dispatch: Expect a tag2upload public keyring
It seems a bit odd to me that this is embedded in this script rather
than in the dispatch-dir or some config or other. But, let's not
change that now.
This file is not yet provided by the test suite. So this causes
errors from gpgv in dgit-repos-server. But those errors are tolerated
because we iterate over keyrings until we find the right key.
dgit-repos-server doesn't make much effort to distinguish different
reasons why gpgv might fail to produce the output it expects, and
treats nonzero exit status as a reason to print to stderr, not a fatal
error.
And, make the corresponding change to the simulated auth string in the
tests.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit bb24f62b0ec6a187075fc05a051b92229bea19d3
Merge: f940ee7e 31ab42ae
Author: Sean Whitton <spwhitton@spwhitton.name>
Date: Sat Mar 15 03:05:56 2025 +0000
Merge branch 'rebuild-from-testing' into 'master'
tag2upload-builder-rebuild: Install dgit and gdr from testing
See merge request dgit-team/dgit!154
commit 31ab42ae3ca7c918223c18fc2fbbb170a237771e
Author: Sean Whitton <spwhitton@spwhitton.name>
Date: Sat Mar 15 10:38:26 2025 +0800
tag2upload-builder-rebuild: Install dgit and gdr from testing
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
commit f940ee7e40727eb95027eaf452dac872a87d9ee1
Author: Sean Whitton <spwhitton@spwhitton.name>
Date: Fri Mar 14 22:35:06 2025 +0800
changelog: Start 12.10
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
![[bug history graph]](https://qa.debian.org/data/bts/graphs/d/dgit.png){kind=link}