Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mention that older rsync versions had a problem with --link-dest and
[rsync/rsync.git]
/
options.c
diff --git
a/options.c
b/options.c
index
a1c8df5
..
9c97191
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-827,6
+827,12
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
am_server ? "server" : "client");
return 0;
#endif
am_server ? "server" : "client");
return 0;
#endif
+ if (compare_dest) {
+ snprintf(err_buf, sizeof err_buf,
+ "--inplace does not yet work with %s\n",
+ link_dest ? "--link-dest" : "--compare-dest");
+ return 0;
+ }
} else if (partial_dir) {
if (strcmp(partial_dir, ".") == 0)
partial_dir = NULL;
} else if (partial_dir) {
if (strcmp(partial_dir, ".") == 0)
partial_dir = NULL;
@@
-1007,8
+1013,7
@@
void server_options(char **args,int *argc)
if (am_sender) {
if (delete_excluded)
args[ac++] = "--delete-excluded";
if (am_sender) {
if (delete_excluded)
args[ac++] = "--delete-excluded";
- else if (delete_mode
- && (!delete_after || protocol_version < 27))
+ else if (delete_mode)
args[ac++] = "--delete";
if (delete_after)
args[ac++] = "--delete";
if (delete_after)