Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
75a01a0
)
Fixed the combination of --dry-run and --only-write-batch.
author
Wayne Davison
<wayned@samba.org>
Sat, 19 Jan 2008 19:20:17 +0000
(11:20 -0800)
committer
Wayne Davison
<wayned@samba.org>
Sat, 19 Jan 2008 19:20:17 +0000
(11:20 -0800)
options.c
patch
|
blob
|
blame
|
history
diff --git
a/options.c
b/options.c
index
11249c0
..
5a24dd2
100644
(file)
--- 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;
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");
if (read_batch && files_from) {
snprintf(err_buf, sizeof err_buf,
"--read-batch cannot be used with --files-from\n");