Fixed failing hunk.
authorWayne Davison <wayned@samba.org>
Tue, 16 Oct 2007 18:36:03 +0000 (18:36 +0000)
committerWayne Davison <wayned@samba.org>
Tue, 16 Oct 2007 18:36:03 +0000 (18:36 +0000)
detect-renamed.diff

index 2b5deab..4f927d9 100644 (file)
@@ -42,15 +42,14 @@ TODO:
  extern int protect_args;
  extern int preserve_uid;
  extern int preserve_gid;
-@@ -105,7 +106,7 @@ static void check_sub_protocol(void)
- void set_allow_inc_recurse(void)
- {
-       if (!recurse || delete_before || delete_after || use_qsort
--       || (!am_sender && (delay_updates || prune_empty_dirs)))
-+       || (!am_sender && (delay_updates || prune_empty_dirs || detect_renamed)))
+@@ -108,6 +109,7 @@ void set_allow_inc_recurse(void)
+               allow_inc_recurse = 0;
+       else if (!am_sender
+        && (delete_before || delete_after
++        || detect_renamed
+         || delay_updates || prune_empty_dirs))
                allow_inc_recurse = 0;
        else if (am_server && !local_server
-        && (!shell_cmd || strchr(shell_cmd, 'i') == NULL))
 --- old/flist.c
 +++ new/flist.c
 @@ -61,6 +61,7 @@ extern int non_perishable_cnt;