From: Joey Hess <joeyh@joeyh.name>
Date: Thu, 27 Jun 2024 16:41:57 +0000 (-0400)
Subject: Merge branch 'master' into proxy
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~21^2~315^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0ef4183b001a1604a7a8663301fac4c0763473ff;p=git-annex.git

Merge branch 'master' into proxy
---

0ef4183b001a1604a7a8663301fac4c0763473ff
diff --cc CHANGELOG
index e9ea6cb909,6084853799..125a72c9ea
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -7,11 -3,11 +7,13 @@@ git-annex (10.20240532) UNRELEASED; urg
    * Fix a bug where interrupting git-annex while it is updating the
      git-annex branch for an export could later lead to git fsck
      complaining about missing tree objects.
 -  * Tab completion of options like --from now includes special remotes.
 +  * Tab completion of options like --from now includes special remotes,
 +    as well as proxied remotes and clusters.
 +  * P2P protocol version 2.
    * Fix Windows build with Win32 2.13.4+
      Thanks, Oleg Tolmatcev
+   * When --debugfilter or annex.debugfilter is set, avoid propigating
+     debug output from git-annex-shell, since it cannot be filtered.
  
   -- Joey Hess <id@joeyh.name>  Mon, 03 Jun 2024 13:03:21 -0400