- Auto-set --verbose if --dry-run is specified w/o --log-format.

- When verbose w/o a log_format specified, set it to "%n%L".
- There's no longer a need to send -i to the server.

diff --git a/options.c b/options.c
index 9b260d4..d2b95bc 100644 (file)
--- a/options.c
+++ b/options.c
@@ -1068,12 +1068,14 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                log_format = "%i %n%L";
                log_before_transfer = !am_server;
        }
-       if (do_progress && !verbose && !log_before_transfer) {
-               if (refused_verbose) {
-                       create_refuse_error(refused_verbose);
-                       return 0;
-               }
+
+       if ((do_progress || dry_run) && !verbose && !log_before_transfer
+           && !refused_verbose)
                verbose = 1;
+
+       if (verbose && !log_format) {
+               log_format = "%n%L";
+               log_before_transfer = !am_server;
        }
 
        if (daemon_bwlimit && (!bwlimit || bwlimit > daemon_bwlimit))
@@ -1225,8 +1227,6 @@ 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)