X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1df02d13d304ea5a35ecc81b26a5419904aacd95..bb4e4d889f51065dcef6f34d8ba4a80c051149a1:/options.c

diff --git a/options.c b/options.c
index 75a6d637..0ac5bfd9 100644
--- a/options.c
+++ b/options.c
@@ -1275,7 +1275,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 		}
 	}
 
-	if (human_readable && argc == 2) {
+	if (human_readable && argc == 2 && !am_server) {
 		/* Allow the old meaning of 'h' (--help) on its own. */
 		usage(FINFO);
 		exit_cleanup(0);
@@ -1387,7 +1387,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			xfer_dirs = 1;
 	}
 
-	if (argc < 2 && !read_batch)
+	if (argc < 2 && !read_batch && !am_server)
 		list_only |= 1;
 
 	if (xfer_dirs >= 4) {
@@ -1532,8 +1532,12 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 		log_before_transfer = !am_server;
 	}
 
-	if (do_progress && !verbose && !log_before_transfer && !am_server)
-		verbose = 1;
+	if (do_progress) {
+		if (am_server)
+			do_progress = 0;
+		else if (!verbose && !log_before_transfer && !am_server)
+			verbose = 1;
+	}
 
 	if (dry_run)
 		do_xfers = 0;