Merge branch 'master' into exportreeplus

diff --cc CHANGELOG
index 0495ba4ff24b12744c8b4fcd2639be91cb4b2967,8ac4edcbc9d32e14dbee5c30f763b955e8adfb4d..8eaef2da4bb37da06b2737c8057c8e21aea146a6
--- 1/CHANGELOG
--- 2/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 <id@joeyh.name>  Wed, 31 Jul 2024 15:52:03 -0400
  

diff --cc doc/todo/exporttree_remotes_could_store_any_key.mdwn
index 5a9c20881b0ef07c043a3d0a47dc3453e63d417a,714332124df08c0ffbbf59ee4eefdf6ad6cf1212..701330e515dd7e358707fedbc66e7d3225e0933c
--- 1/doc/todo/exporttree_remotes_could_store_any_key.mdwn
--- 2/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]]