Bug#1109255: unblock: git-annex/10.20250416-1

[Sean Whitton]

Package: release.debian.org
Severity: normal
X-Debbugs-Cc: git-annex at packages.debian.org
Control: affects -1 + src:git-annex
User: release.debian.org at packages.debian.org
Usertags: unblock

Please unblock package git-annex.  This upload cherry picks a textually small
fix for compatibility with Git 2.5.0, which latter recently entered trixie.

Without this fix users will experience some confusing, intermittent failures
of some git annex subcommands, as detailed here:
<https://git-annex.branchable.com/bugs/test_suite_fail_with_git_2.50/>.

There are autopkgtests testing the affected code.  I expected the package to
migrate itself but britney says "autopkgtest not fully successful" so I'm
filing an unblock request.  Thanks.

unblock git-annex/10.20250416-1

-- 
Sean Whitton
-------------- next part --------------
diff -Nru git-annex-10.20250416/debian/changelog git-annex-10.20250416/debian/changelog
--- git-annex-10.20250416/debian/changelog	2025-04-25 07:34:27.000000000 +0100
+++ git-annex-10.20250416/debian/changelog	2025-07-01 11:23:57.000000000 +0100
@@ -1,3 +1,9 @@
+git-annex (10.20250416-2) unstable; urgency=medium
+
+  * Cherry pick compatibility fix for Git 2.5.0 (Closes: #1108526).
+
+ -- Sean Whitton <spwhitton at spwhitton.name>  Tue, 01 Jul 2025 11:23:57 +0100
+
 git-annex (10.20250416-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru git-annex-10.20250416/debian/patches/debian-changes git-annex-10.20250416/debian/patches/debian-changes
--- git-annex-10.20250416/debian/patches/debian-changes	2025-04-25 07:34:27.000000000 +0100
+++ git-annex-10.20250416/debian/patches/debian-changes	2025-07-01 11:23:57.000000000 +0100
@@ -54,3 +54,37 @@
  License: BSD-2-clause
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
+--- git-annex-10.20250416.orig/Database/Keys.hs
++++ git-annex-10.20250416/Database/Keys.hs
+@@ -1,6 +1,6 @@
+ {- Sqlite database of information about Keys
+  -
+- - Copyright 2015-2022 Joey Hess <id at joeyh.name>
++ - Copyright 2015-2025 Joey Hess <id at joeyh.name>
+  -
+  - Licensed under the GNU AGPL version 3 or higher.
+  -}
+@@ -260,7 +260,7 @@ isInodeKnown i s = or <$> runReaderIO Co
+  - is an associated file.
+  -}
+ reconcileStaged :: Bool -> H.DbQueue -> Annex DbTablesChanged
+-reconcileStaged dbisnew qh = ifM isBareRepo
++reconcileStaged dbisnew qh = ifM notneeded
+ 	( return mempty
+ 	, do
+ 		gitindex <- inRepo currentIndexFile
+@@ -335,6 +335,14 @@ reconcileStaged dbisnew qh = ifM isBareR
+ 	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
++	
+ 	diff old new =
+ 		-- Avoid running smudge clean filter, since we want the
+ 		-- raw output, and it would block trying to access the
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-maintainers/attachments/20250714/7bdbb4d9/attachment.sig>