update

diff --git a/CHANGELOG b/CHANGELOG
index df56ad9366e7c11d0a430436ba02c7a79b8b995e..e2161f943f9c568f801abf51332a4f9785cbb622 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,9 @@ git-annex (10.20240732) UNRELEASED; urgency=medium
     can store objects in .git/annex/objects, as well as an exported tree.
   * Support proxying to special remotes configured with 
     exporttree=yes annexobjects=yes.
+  * post-retrieve: When proxying is enabled for an exporttree=yes
+    special remote and the configured remote.name.annex-tracking-branch
+    is received, the tree is exported to the special remote.
   * 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.

diff --git a/doc/git-annex-post-receive.mdwn b/doc/git-annex-post-receive.mdwn
index bc60ee36377e0fed0b98e1a4d1450f2844be55d9..0e7af55b88c24aa5aa1a989979a9f468516c8e91 100644 (file)
--- a/doc/git-annex-post-receive.mdwn
+++ b/doc/git-annex-post-receive.mdwn
@@ -18,8 +18,9 @@ out. The hook updates the work tree when run in such a repository,
 the same as running `git-annex merge` would.
 
 When a repository is configured to proxy to a special remote with
-exporttree=yes, the hook handles updating the tree exported to the special
-remote.
+exporttree=yes, and the configured remote.name.annex-tracking-branch
+is received, the hook handles updating the tree exported to the
+special remote.
 
 # OPTIONS
 
@@ -33,6 +34,8 @@ remote.
 
 [[git-annex-merge]](1)
 
+[[git-annex-export]](1)
+
 # AUTHOR
 
 Joey Hess <id@joeyh.name>

diff --git a/doc/todo/git-annex_proxies.mdwn b/doc/todo/git-annex_proxies.mdwn
index 6255dce1ed6aa9f7ba7ff467f6acb18415e68075..aa6be63cbeef9a7a4efec576cfbfafc8ce97090f 100644 (file)
--- a/doc/todo/git-annex_proxies.mdwn
+++ b/doc/todo/git-annex_proxies.mdwn
@@ -41,7 +41,7 @@ Planned schedule of work:
          export not supported
        failed
 
-* Prevent `enableproxy` from enabling an exporttree=yes special remote
+* Prevent `updateproxy` from enabling an exporttree=yes special remote
   that does not have annexobjects=yes, to avoid foot shooting.
 
 * Handle cases where a single key is used by multiple files in the exported
@@ -54,6 +54,21 @@ Planned schedule of work:
   Each key will need to be downloaded from it in order to export the key
   back to it, if the proxy is to support such a remote.
 
+## completed items for August
+
+* 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.
+
+* post-retrieve: When proxying is enabled for an exporttree=yes
+  special remote and the configured remote.name.annex-tracking-branch
+  is received, the tree is exported to the special remote.
+
+* When getting from a P2P HTTP remote, prompt for credentials when
+  required, instead of failing.
+
 ## items deferred until later for p2p protocol over http
 
 * `git-annex p2phttp` should support serving several repositories at the same