Your message dated Tue, 07 Oct 2025 17:04:35 +0000
with message-id <[email protected]>
and subject line Bug#1116933: fixed in dgit 13.16
has caused the Debian Bug report #1116933,
regarding workarea recursion mishandling can result in strange behaviours
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1116933: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1116933
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-debrebase
Version: 12.10
Severity: important
git-debrebase has some `fresh_workarea` and `in_workarea` functions
that it uses to manage private playground directories. But, there is
a bug: if `in_workarea` is called recursively, on return to the
intermediate context, the cwd has been changed back to the $maindir,
rather than the intermediate playground directory.
This can result in strange changes to the user's ref namespace, git
index, and/or working tree.
I think this kind of recursion only happens when encountering "vanilla
merges". Certainly, when I added a tripwire for this, those were the
only cases where our test suite failed.
Prior to 12.10 these were behind an "exprimental" option. This is a
failure mode I hadn't anticipated when I decided to turn this option
on by default. The consequences can be rather more severe.
I think they should be fixed with a stable update (not just an upload
to -backports). I will prepare a a patch that is suitable for
backporting to the `trixie` branch.
Ian.
--
Ian Jackson <[email protected]> These opinions are my own.
Pronouns: they/he. If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.
--- End Message ---
--- Begin Message ---
Source: dgit
Source-Version: 13.16
Done: Sean Whitton <[email protected]>
We believe that the bug you reported is fixed in the latest version of
dgit, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Sean Whitton <[email protected]> (supplier of updated dgit package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Tue, 07 Oct 2025 17:43:34 +0100
Source: dgit
Architecture: source
Version: 13.16
Distribution: unstable
Urgency: medium
Maintainer: Debian tag2upload Delegates <[email protected]>
Changed-By: Sean Whitton <[email protected]>
Closes: 1111355 1114805 1116659 1116933
Changes:
dgit (13.16) unstable; urgency=medium
.
git-debrebase bugfixes [Ian Jackson]:
* Merge resolution: Fix erroneous use of real git tree as
if it were a private working area. Closes: #1116933.
* Merge resolution: Fix conflation of different temporary directories.
* Clean out all of the temporary playground area on every invocation.
* Nail down the date for constructing git commits, to avoid
stochastic failures (especially during vanilla merge resolution).
.
dgit bugfixes [Ian Jackson]:
* dgit: Print progress when downloading files mentioned in .dscs,
eg in download-unfetched-origs. Closes: #1111355.
.
Packaging:
* Switch git-debpush.deb dependencies from gnupg to gpg, gpg-agent.
Allows use with implementations other than gnupg.
Closes: #1116659. [Paride Legovini, Sean Whitton]
.
New feature:
* git-debrebase: Provide git-debrebase examine COMMITISH. [Ian Jackson]
.
Documentation:
* i18n: More European Portuguese manpages translations.
Closes: #1114805. [Américo Monteiro]
* git-debpush(1): Reword --quilt=linear description,
to disambiguate it somewhat.
* dgit(1): Reflect that curl(1) is not in fact used by dgit, nowadays.
[Ian Jackson]
.
Cleanups and supporting changes [Ian Jackson]:
* dgit: Abolish the obsolete sshpsql archive access method.
* dgit innards: Deconfuse/disambiguate "archive_query" functions.
* Other minor tidying in git-debrebase and dgit.
Checksums-Sha1:
a0af8bc738a7afe8143b42c5849229fc19ad3386 2513 dgit_13.16.dsc
5ea4bfcc8e0b6c39de1dca16c76ebdfc85af53c2 874068 dgit_13.16.tar.gz
4747abac601cbffeb682b77b5ce54d6a65a9186d 1139744 dgit_13.16.git.tar.xz
fec853f9227b17e067f5e2fadc533f93a945ed13 18198 dgit_13.16_source.buildinfo
Checksums-Sha256:
83637c738abb02d164cf2c4960804fd11adce6880719a631cc38790f8190d5d3 2513
dgit_13.16.dsc
a75b8fbbb452d7706b7cb65563f02dcd06f7e5277c7f491b688d49c44c8c9769 874068
dgit_13.16.tar.gz
1c7d1de3d4da0ad6becf9160cfd8041627d84c8d6ead49d6df6803a3a1d4a015 1139744
dgit_13.16.git.tar.xz
3750998f418ddb75320a55b37259bc43a23d7c01030f915e142ce0737207061c 18198
dgit_13.16_source.buildinfo
Files:
0423418820b5a5057bb3d53acb031ed6 2513 devel optional dgit_13.16.dsc
dec0fd90df6b84c2d2b0af4c582d19bb 874068 devel optional dgit_13.16.tar.gz
097a88604eb4bd2e1b5824482d4949f8 1139744 devel optional dgit_13.16.git.tar.xz
a56f47e79e3cc29bfb4bf7a82a531614 18198 devel optional
dgit_13.16_source.buildinfo
Git-Tag-Info: tag=eb7bb1baeee9c6d69fc083709b9827a061ab9443
fp=9b917007ae030e36e4fc248b695b7ae4bf066240
Git-Tag-Tagger: Sean Whitton <[email protected]>
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEN02M5NuW6cvUwJcqYG0ITkaDwHkFAmjlQ6gACgkQYG0ITkaD
wHnhdxAA6fmZLlRpzc9xIqU4ObLGqexL0toKSwpyHzPnwQzwuDd5tXdnhDhYmqqc
wSJ80mCXO5PHfsKRLCP64vix4M7GXHOOVeHzn2w2te8myPU4osWZ2ML3rAoqhPEU
V9X3blxEUXPbU9a898zCZqOPM5UkWD9StOPK5UhyQen/oZPPhJGIYCCncfJzi991
rXdu/jzq8WgL5Kg15NO2O+/dlBG+dZw0xkJ1I5NMSq+y2YL8YHGi21CfQf3yz4Ov
24FrCttEJ+CCK7/lP0kIOf4Liv5Wx4ttPU3Xa8gUCCMKtQoiBxHg2ldrjMs6/9CU
YIHSsbIifz0MPqOF/gifMabHpqxeB0ZQRSO7LNO+EheLsUvl9c+92nzLy4PsbI3S
oKhpzq7NJunsvq+3NKd6BFh1xsGbDgIID4lgYILMAg/1j2cRodBjhUvUU5z0xsKC
Jw4dN5sParFQokBu3JDMRkkhXu8MjbZpKdAJ8thMkkXDSm/ImaXfmCxlO48QFvQY
f75a3bgMfsqoiGC9u+bJt8oh1Ch0A9wNj1YOnwcLzniHwGO5AdYu6IF7gMNmGEjV
FoGUmDqf3Xe+LO/2jacznxFAHK/gqECOJnMGfPQqplmYaAR71AYdkA3AGp+T+MOq
9NUYtC9yX+b/UjryOeyAWC5M6kyW1Rw3SLeOiyl5DQkvKc8Ymr4=
=d+e0
-----END PGP SIGNATURE-----
pgpqwqe3iR2vI.pgp
Description: PGP signature
--- End Message ---
