diff options
author | Wayne Davison <wayned@samba.org> | 2007-07-14 21:49:11 +0000 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2007-07-14 21:49:11 +0000 |
commit | 79cd0c7fa4a89ac4c48345059ce65d2411cbf767 (patch) | |
tree | 7338d2ed3a615496a6472b343f37712a4da3b93e /compat.c | |
parent | de8c8b28c03d5e0d4d745f804aef781cd276c379 (diff) | |
download | rsync-79cd0c7fa4a89ac4c48345059ce65d2411cbf767.tar.gz |
Using --relative with --no-implied-dirs turns off incremental recursion.
(A temporary measure until some bugs can be fixed.)
Diffstat (limited to 'compat.c')
-rw-r--r-- | compat.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -33,9 +33,11 @@ extern int inplace; extern int recurse; extern int use_qsort; extern int allow_inc_recurse; +extern int relative_paths; extern int fuzzy_basis; extern int read_batch; extern int max_delete; +extern int implied_dirs; extern int delay_updates; extern int checksum_seed; extern int basis_dir_cnt; @@ -209,7 +211,8 @@ void setup_protocol(int f_out,int f_in) } else if (protocol_version >= 30) { if (recurse && allow_inc_recurse && !preserve_hard_links && !delete_before && !delete_after && !delay_updates - && !prune_empty_dirs && !use_qsort) + && (!relative_paths || implied_dirs) && !use_qsort + && !prune_empty_dirs) inc_recurse = 1; need_messages_from_generator = 1; } |