Your message dated Tue, 19 Aug 2025 11:50:32 +0000
with message-id <[email protected]>
and subject line Bug#1109673: fixed in git-annex 10.20250721-1
has caused the Debian Bug report #1109673,
regarding fix for #1108526 made test suite flaky
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.)
--
1109673: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1109673
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-annex
Version: 10.20250416-2
Severity: normal
Unfortunately, the patch used to fix #1108526 in git-annex causes its
test suite to fail about 1 run in 10 or so. And there is new buggy
behavior in some circumstances.
See https://git-annex.branchable.com/bugs/flaky_test_failure_add_dup/
for details and analysis.
The attached patch applied on top of the fix your previously cherry
picked will fix this. (It's commit
cf449837ea9ab7687d8a157f21cad31ddf5bbfb6 in git-annex)
--
see shy jo
diff --git a/Database/Keys.hs b/Database/Keys.hs
index 98a1db9053..d3fce7bbd8 100644
--- a/Database/Keys.hs
+++ b/Database/Keys.hs
@@ -260,7 +260,7 @@ isInodeKnown i s = or <$> runReaderIO ContentTable
- is an associated file.
-}
reconcileStaged :: Bool -> H.DbQueue -> Annex DbTablesChanged
-reconcileStaged dbisnew qh = ifM notneeded
+reconcileStaged dbisnew qh = ifM isBareRepo
( return mempty
, do
gitindex <- inRepo currentIndexFile
@@ -299,12 +299,12 @@ reconcileStaged dbisnew qh = ifM notneeded
inRepo $ update' lastindexref newtree
fastDebug "Database.Keys" "reconcileStaged end"
return (DbTablesChanged True True)
- -- git write-tree will fail if the index is locked or when there is
- -- a merge conflict. To get up-to-date with the current index,
- -- diff --staged with the old index tree. The current index tree
- -- is not known, so not recorded, and the inode cache is not updated,
- -- so the next time git-annex runs, it will diff again, even
- -- if the index is unchanged.
+ -- Was not able to run git write-tree, or it failed due to the
+ -- index being locked or a merge conflict. To get up-to-date with
+ -- the current index, diff --staged with the old index tree. The
+ -- current index tree is not known, so not recorded, and the inode
+ -- cache is not updated, so the next time git-annex runs, it will
+ -- diff again, even if the index is unchanged.
--
-- When there is a merge conflict, that will not see the new local
-- version of the files that are conflicted. So a second diff
@@ -327,21 +327,22 @@ reconcileStaged dbisnew qh = ifM notneeded
processor l False
`finally` void cleanup
- -- Avoid running smudge clean filter, which would block trying to
- -- access the locked database. git write-tree sometimes calls it,
- -- even though it is not adding work tree files to the index,
- -- and so the filter cannot have an effect on the contents of the
- -- index or on the tree that gets written from it.
- getindextree = inRepo $ \r -> writeTreeQuiet $ r
- { gitGlobalOpts = gitGlobalOpts r ++ bypassSmudgeConfig }
-
- notneeded = isBareRepo
- -- Avoid doing anything when run by the
- -- smudge clean filter. When that happens in a conflicted
- -- merge situation, running git write-tree
- -- here would cause git merge to fail with an internal
- -- error. This works around around that bug in git.
- <||> Annex.getState Annex.insmudgecleanfilter
+ -- This avoids running git write-tree when run by the smudge clean
+ -- filter, in order to work around a bug in git. That causes
+ -- git merge to fail with an internal error when git write-tree is
+ -- run by the smudge clean filter in conflicted merge situation.
+ --
+ -- When running git write-tree, avoid it running the smudge clean
+ -- filter, which would block trying to access the locked database.
+ -- git write-tree sometimes calls it, even though it is not adding
+ -- work tree files to the index, and so the filter cannot have an
+ -- effect on the contents of the index or on the tree that gets
+ -- written from it.
+ getindextree = ifM (Annex.getState Annex.insmudgecleanfilter)
+ ( return Nothing
+ , inRepo $ \r -> writeTreeQuiet $ r
+ { gitGlobalOpts = gitGlobalOpts r ++ bypassSmudgeConfig }
+ )
diff old new =
-- Avoid running smudge clean filter, since we want the
signature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---
Source: git-annex
Source-Version: 10.20250721-1
Done: Sean Whitton <[email protected]>
We believe that the bug you reported is fixed in the latest version of
git-annex, 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 git-annex 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, 19 Aug 2025 12:24:22 +0100
Source: git-annex
Architecture: source
Version: 10.20250721-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Haskell Group
<[email protected]>
Changed-By: Sean Whitton <[email protected]>
Closes: 1109673
Changes:
git-annex (10.20250721-1) unstable; urgency=medium
.
* New upstream release (Closes: #1109673).
Checksums-Sha1:
1e1c9510511b95a0ff56d9bca216f3360b149da5 6039 git-annex_10.20250721-1.dsc
ed8a2aa6dcd63ec0c1646d49318d52e23309d758 7133864
git-annex_10.20250721.orig.tar.xz
cbeb59a312ae4162d51334d6b449a11bd3fc0110 80696
git-annex_10.20250721-1.debian.tar.xz
0c9bd79fa1fd7ed4ca1e7331de82250d655b57f1 14438664
git-annex_10.20250721-1.git.tar.xz
08f2ea8eff258ef790771e5f35c00148ab591b34 18086
git-annex_10.20250721-1_source.buildinfo
Checksums-Sha256:
146e040c5fa334ac6b93d46f6d045adc5b29ac3f6d5b9569ede6542b5c2b82f0 6039
git-annex_10.20250721-1.dsc
2781f8fccb7b8632f8c1325e7e8334638bd9471e61b803924299ce3626a76b9a 7133864
git-annex_10.20250721.orig.tar.xz
5858d52d5e0ec088f2651eb78a5c43e7f7c6347e6e1d50013228ca1e64445472 80696
git-annex_10.20250721-1.debian.tar.xz
658390fc453cb1d18428d00f667fb3dfb4a7bfd35a55c20cce5dc71d99e7d004 14438664
git-annex_10.20250721-1.git.tar.xz
5a9d00033d2b7853644f8d3fb1161177fbdcfb055897cee030853950f7dfb25a 18086
git-annex_10.20250721-1_source.buildinfo
Files:
552ed909b031053bd75d58a306e7ac18 6039 utils optional
git-annex_10.20250721-1.dsc
594b52323cdfedd11f5fa864775d92ed 7133864 utils optional
git-annex_10.20250721.orig.tar.xz
b64cc2c7117bb7af9a0e4d3f540c5efe 80696 utils optional
git-annex_10.20250721-1.debian.tar.xz
526d7594da5ddf01f6d6b1875f346180 14438664 utils optional
git-annex_10.20250721-1.git.tar.xz
e5518fb3aa89e371d71f4e8429cb5b74 18086 utils optional
git-annex_10.20250721-1_source.buildinfo
Git-Tag-Info: tag=128b70217e3c7ec6a508d7c22fc6e6ffcc027814
fp=9b917007ae030e36e4fc248b695b7ae4bf066240
Git-Tag-Tagger: Sean Whitton <[email protected]>
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEN02M5NuW6cvUwJcqYG0ITkaDwHkFAmikX2cACgkQYG0ITkaD
wHl17BAA2gQddueCfj2xV2DL0ZNJINBK7ZCG9RJagQmZIwhmB5lFEaXFWncEmbpZ
usuUJ7Mp40gYuqmDuwf7w8NdyOjOMP0HsMIul+XDYnxk61mus5YKx52v1LmUmw/C
p2vGbJZXKVY71vGaIonxsxUj/pIbhfNpMlwFkdP9trpiNnsTLzoGuRcfmC7xmK+f
WHMjDEzvJ2QMZsefFMNx1ISpnZU+074UfXrjRbbknvUVL1ibwajle6Nanw1oJ8jn
GgKKDtLEI3bnFT9iNSTKwAzFImWo71pJO54I755S3UPiJEJB64J+MaDjTCBrNZ5n
Fv060VzBC8YTsaMwrCNvAiRDxkmaj1MYJoTmgHWB9ggC/1yBRlGFfxmWSFohWbSO
tYfc+EdwWHFnRlZ2G06nyzNvVi6JXGWR5s1T2tJ9Z/INlcIG6lg9Ta8YY3faD++z
5/9aPAQO+Gf9tRPc4ta/5xlU4qakDiR4jfHexAwc+LMDzaDs2iOj8btjarF1NqHw
c9fd64Quq537h9XCbhdtmATiSw479g7ZpMoJlN6qdEJUXmXZDfopwhX8Zdfd/Hpi
QCt5baq8WNdE1pYJXAk10Cts7/E6s4XexLUmigetQUAh8CT1zi3dmpkF9nQP2onP
xsZAShquCHvRhob377OHfockPBl8PkPkQPIw1q5D+je0ZilwLMw=
=uYIu
-----END PGP SIGNATURE-----
pgpDPlsymQOxI.pgp
Description: PGP signature
--- End Message ---
