From: Wayne Davison <wayne@opencoder.net>
Date: Mon, 25 May 2020 02:35:22 +0000 (-0700)
Subject: Don't auto-foward debug options to the server side anymore.
X-Git-Tag: v3.2.0pre1~114
X-Git-Url: http://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=faecd066a6b523713299e659d8295eb8e308f9ed

Don't auto-foward debug options to the server side anymore.
---

diff --git a/options.c b/options.c
index ff8c390e..1a0d2c22 100644
--- a/options.c
+++ b/options.c
@@ -2908,10 +2908,6 @@ void server_options(char **args, int *argc_p)
 	if (arg)
 		args[ac++] = arg;
 
-	arg = make_output_option(debug_words, debug_levels, where);
-	if (arg)
-		args[ac++] = arg;
-
 	if (append_mode) {
 		if (append_mode > 1)
 			args[ac++] = "--append";
diff --git a/rsync.yo b/rsync.yo
index 0b6c8d65..5f615268 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -573,10 +573,14 @@ verb(    rsync -avvv --debug=none src/ dest/
 Note that some debug messages will only be output when bf(--msgs2stderr) is
 specified, especially those pertaining to I/O and buffer debugging.
 
-This option was added to 3.1.0, so an older rsync on the server side might
-reject your attempts at fine-grained control (if one or more flags needed
-to be send to the server and the server was too old to understand them).
-See also the "max verbosity" caveat above when dealing with a daemon.
+Beginning in 3.2.0, this option is no longer auto-forwared to the server side
+in order to allow you to specify different debug values for each side of the
+transfer, as well as to specify a new debug option that is only present in one
+of the rsync versions.  If you want to duplicate the same option on both sides,
+using brace expansion is an easy way to save you some typing. This works in
+zsh and bash:
+
+verb(    rsync -aiv {-M,}--debug=del2 src/ dest/ )
 
 dit(bf(--msgs2stderr)) This option changes rsync to send all its output
 directly to stderr rather than to send messages to the client side via the