From: Wayne Davison <wayned@samba.org>
Date: Tue, 16 Oct 2007 18:36:03 +0000 (+0000)
Subject: Fixed failing hunk.
X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/9aab301ce40f66967d3cc8ff3b09e38088de546a

Fixed failing hunk.
---

diff --git a/detect-renamed.diff b/detect-renamed.diff
index 2b5deab..4f927d9 100644
--- a/detect-renamed.diff
+++ b/detect-renamed.diff
@@ -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;