From: Wayne Davison <wayned@samba.org>
Date: Sat, 19 Jan 2008 19:20:17 +0000 (-0800)
Subject: Fixed the combination of --dry-run and --only-write-batch.
X-Git-Tag: v3.0.0pre9~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69e2b4ee3a5f5e4b5792714697766a7ee4d18029;p=thirdparty%2Frsync.git

Fixed the combination of --dry-run and --only-write-batch.
---

diff --git a/options.c b/options.c
index 11249c07..5a24dd2f 100644
--- a/options.c
+++ b/options.c
@@ -1306,7 +1306,8 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
 			batch_name = NULL;
 		} else if (dry_run)
 			write_batch = 0;
-	}
+	} else if (write_batch < 0 && dry_run)
+		write_batch = 0;
 	if (read_batch && files_from) {
 		snprintf(err_buf, sizeof err_buf,
 			"--read-batch cannot be used with --files-from\n");