Mention that --whole-file interferes with the reuse of a --partial-dir

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 04975b6..b999ac8 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -154,7 +154,6 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
                        c >>= 1;
                } while (c >= 8);       /* round to multiple of 8 */
                blength = MAX(blength, BLOCK_SIZE);
-               blength = MIN(blength, MAX_BLOCK_SIZE);
        }
 
        if (protocol_version < 27) {
@@ -274,8 +273,14 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
                return;
        }
 
-       statret = link_stat(fname, &st, keep_dirlinks && S_ISDIR(file->mode));
-       stat_errno = errno;
+       if (dry_run > 1) {
+               statret = -1;
+               stat_errno = ENOENT;
+       } else {
+               statret = link_stat(fname, &st,
+                                   keep_dirlinks && S_ISDIR(file->mode));
+               stat_errno = errno;
+       }
 
        if (only_existing && statret == -1 && stat_errno == ENOENT) {
                /* we only want to update existing files */