aboutsummaryrefslogtreecommitdiffstats
path: root/options.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2008-01-19 11:20:17 -0800
committerWayne Davison <wayned@samba.org>2008-01-19 11:20:17 -0800
commit69e2b4ee3a5f5e4b5792714697766a7ee4d18029 (patch)
tree07f4842c48cea60ed4133b752100fa502e1b5b8c /options.c
parent75a01a0734365883bbf9629b7818fb684a7bcb59 (diff)
downloadandroid_external_rsync-69e2b4ee3a5f5e4b5792714697766a7ee4d18029.tar.gz
android_external_rsync-69e2b4ee3a5f5e4b5792714697766a7ee4d18029.tar.bz2
android_external_rsync-69e2b4ee3a5f5e4b5792714697766a7ee4d18029.zip
Fixed the combination of --dry-run and --only-write-batch.
Diffstat (limited to 'options.c')
-rw-r--r--options.c3
1 files changed, 2 insertions, 1 deletions
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");