--iAbhCWh8B76qbJ9H
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
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
--iAbhCWh8B76qbJ9H
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="git-annex.patch" Content-Transfer-Encoding: quoted-printable
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 ol