From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 7 Aug 2024 15:28:21 +0000 (-0400)
Subject: Merge branch 'master' into exportreeplus
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~21^2~159^2~13
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b8f8c38e88bac867661b3d9e047facc471285da6;p=git-annex.git

Merge branch 'master' into exportreeplus
---

b8f8c38e88bac867661b3d9e047facc471285da6
diff --cc CHANGELOG
index 45f07396dd,d9b7e2df1c..df56ad9366
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,14 -2,10 +2,16 @@@ git-annex (10.20240732) UNRELEASED; urg
  
    * Remove debug output (to stderr) accidentially included in
      last version.
 +  * Special remotes configured with exporttree=yes annexobjects=yes 
 +    can store objects in .git/annex/objects, as well as an exported tree.
 +  * Support proxying to special remotes configured with 
 +    exporttree=yes annexobjects=yes.
 +  * git-remote-annex: Store objects in exportree=yes special remotes
 +    in the same paths used by annexobjects=yes.
    * When proxying an upload to a special remote, verify the hash.
    * Avoid loading cluster log at startup.
+   * When getting from a P2P HTTP remote, prompt for credentials when
+     required, instead of failing.
  
   -- Joey Hess <id@joeyh.name>  Wed, 31 Jul 2024 15:52:03 -0400