Merge branch 'master' into proxy

CHANGELOG

@@ -12,6 +12,8 @@ git-annex (10.20240532) UNRELEASED; urgency=medium
   * 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
 

Remote/Helper/Ssh.hs

@@ -21,6 +21,7 @@ import Remote.Helper.Messages
 import Utility.Metered
 import Utility.Rsync
 import Utility.SshHost
+import Utility.Debug
 import Types.Remote
 import Types.Transfer
 import Config
@@ -61,9 +62,10 @@ git_annex_shell cs r command params fields
 	shellcmd = "git-annex-shell"
 	getshellopts = do
 		debugenabled <- Annex.getRead Annex.debugenabled
-		let params' = if debugenabled
-			then Param "--debug" : params
-			else params
+		debugselector <- Annex.getRead Annex.debugselector
+		let params' = case (debugenabled, debugselector) of
+			(True, NoDebugSelector) -> Param "--debug" : params
+			_ -> params
 		return (Param command : File (fromRawFilePath dir) : params')
 	uuidcheck NoUUID = []
 	uuidcheck u@(UUID _) = ["--uuid", fromUUID u]