diff options
author | Wayne Davison <wayned@samba.org> | 2008-01-19 11:20:17 -0800 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2008-01-19 11:20:17 -0800 |
commit | 69e2b4ee3a5f5e4b5792714697766a7ee4d18029 (patch) | |
tree | 07f4842c48cea60ed4133b752100fa502e1b5b8c /options.c | |
parent | 75a01a0734365883bbf9629b7818fb684a7bcb59 (diff) | |
download | rsync-69e2b4ee3a5f5e4b5792714697766a7ee4d18029.tar.gz |
Fixed the combination of --dry-run and --only-write-batch.
Diffstat (limited to 'options.c')
-rw-r--r-- | options.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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"); |