From: Sean Whitton Date: Tue, 1 Jul 2025 10:24:23 +0000 (+0100) Subject: Commit Debian 3.0 (quilt) metadata X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=436d80ecab4cda1f69e58513b472a837d487c2b3;p=git-annex.git Commit Debian 3.0 (quilt) metadata [dgit (12.15) quilt-fixup] --- diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes index 49290bb9a7..72ccb4c4a8 100644 --- a/debian/patches/debian-changes +++ b/debian/patches/debian-changes @@ -54,3 +54,37 @@ A single combined diff, containing all the changes, follows. 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 ++ - Copyright 2015-2025 Joey Hess + - + - 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