From: Joey Hess Date: Fri, 2 Aug 2024 22:45:44 +0000 (-0400) Subject: Merge branch 'master' into exportreeplus X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~21^2~159^2~29 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9da286081295d4b10d24336d7bfc4ae527bd58f1;p=git-annex.git Merge branch 'master' into exportreeplus --- 9da286081295d4b10d24336d7bfc4ae527bd58f1 diff --cc CHANGELOG index 0495ba4ff2,8ac4edcbc9..8eaef2da4b --- a/CHANGELOG +++ b/CHANGELOG @@@ -1,10 -1,8 +1,12 @@@ git-annex (10.20240732) UNRELEASED; urgency=medium * Avoid loading cluster log at startup. + * Remove debug output (to stderr) accidentially included in + last version. + * Remotes configured with exporttree=yes annexobjects=yes + can store objects in .git/annex/objects, as well as an exported tree. + * git-remote-annex: Store objects in exportree=yes special remotes + in the same paths used by annexobjects=yes. -- Joey Hess Wed, 31 Jul 2024 15:52:03 -0400 diff --cc doc/todo/exporttree_remotes_could_store_any_key.mdwn index 5a9c20881b,714332124d..701330e515 --- a/doc/todo/exporttree_remotes_could_store_any_key.mdwn +++ b/doc/todo/exporttree_remotes_could_store_any_key.mdwn @@@ -75,5 -66,10 +75,9 @@@ exporttree=yes special remote R lost track of the fact that A moved it to the objects location. So, when calling removeExport, have to also check if the key is present in -the objects location. If so, don't record the key as missing. (Or course, -it already checks if some other exported file also has the content of the -key.) +the objects location. If so, either don't record the key as missing, or +also remove from the objects location. + + --- + + Implementing in the "exportreeplus" branch --[[Joey]]