From: Wayne Davison <wayned@samba.org>
Date: Tue, 15 Feb 2005 07:20:11 +0000 (+0000)
Subject: Don't force -v with -n if -w was specified.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/93c31c1a6d1016924acea01791d6453de75063b6?hp=a8ed49583304181a0516ce98014ae7389ec4c160

Don't force -v with -n if -w was specified.
---

diff --git a/main.c b/main.c
index fc67eae2..46d4f69f 100644
--- a/main.c
+++ b/main.c
@@ -30,6 +30,7 @@ extern int am_sender;
 extern int am_generator;
 extern int am_daemon;
 extern int verbose;
+extern int what_has_changed;
 extern int blocking_io;
 extern int delete_before;
 extern int daemon_over_rsh;
@@ -1173,8 +1174,8 @@ int main(int argc,char *argv[])
 		exit_cleanup(RERR_SYNTAX);
 	}
 
-	if (dry_run)
-		verbose = MAX(verbose,1);
+	if (dry_run && !verbose && !what_has_changed)
+		verbose = 1;
 
 	if (am_server) {
 		set_nonblocking(STDIN_FILENO);