X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/87383697e8cbfab13f5119b63f5426a73c96d928..1f30a674cdbdb464b74181c2ef8588fa48b74ab1:/options.c?ds=inline

diff --git a/options.c b/options.c
index d2b95bc3..4d3d0385 100644
--- a/options.c
+++ b/options.c
@@ -152,7 +152,7 @@ char *batch_name = NULL;
 static int daemon_opt;   /* sets am_daemon after option error-reporting */
 static int F_option_cnt = 0;
 static int modify_window_set;
-static int refused_verbose, refused_delete, refused_archive_part;
+static int refused_delete, refused_archive_part;
 static int refused_partial, refused_progress, refused_delete_before;
 static char *dest_option = NULL;
 static char *max_size_arg;
@@ -548,9 +548,6 @@ static void set_refuse_options(char *bp)
 				/* These flags are set to let us easily check
 				 * an implied option later in the code. */
 				switch (*shortname) {
-				case 'v':
-					refused_verbose = op->val;
-					break;
 				case 'r': case 'd': case 'l': case 'p':
 				case 't': case 'g': case 'o': case 'D':
 					refused_archive_part = op->val;
@@ -1070,7 +1067,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 	}
 
 	if ((do_progress || dry_run) && !verbose && !log_before_transfer
-	    && !refused_verbose)
+	    && !am_server)
 		verbose = 1;
 
 	if (verbose && !log_format) {
@@ -1227,6 +1224,8 @@ void server_options(char **args,int *argc)
 	 * default for remote transfers, and in any case old versions
 	 * of rsync will not understand it. */
 
+	if (itemize_changes)
+		argstr[x++] = 'i';
 	if (preserve_hard_links)
 		argstr[x++] = 'H';
 	if (preserve_uid)
@@ -1272,6 +1271,11 @@ void server_options(char **args,int *argc)
 	if (list_only > 1)
 		args[ac++] = "--list-only";
 
+	/* The server side doesn't use our log-format, but if verbose isn't
+	 * on, they may need to know that we want some extra messages. */
+	if (log_format && !verbose && !itemize_changes)
+		args[ac++] = "--log-format=specified";
+
 	if (block_size) {
 		if (asprintf(&arg, "-B%lu", block_size) < 0)
 			goto oom;