X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9970bed4d99f70dab4676ae92dab104a70aae56c..2ad3c71777c90aa65813f89e57ac6412e73b36db:/compat.c

diff --git a/compat.c b/compat.c
index b0574242..888f94d9 100644
--- a/compat.c
+++ b/compat.c
@@ -104,8 +104,11 @@ 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)))
+	if (!recurse || use_qsort)
+		allow_inc_recurse = 0;
+	else if (!am_sender
+	 && (delete_before || delete_after
+	  || delay_updates || prune_empty_dirs))
 		allow_inc_recurse = 0;
 	else if (am_server && !local_server
 	 && (!shell_cmd || strchr(shell_cmd, 'i') == NULL))
@@ -238,7 +241,7 @@ void setup_protocol(int f_out,int f_in)
 			/* This should only be able to happen in a batch. */
 			fprintf(stderr,
 			    "Incompatible options specified for inc-recursive %s.\n",
-			    read_batch ? "batch file" : "protocol");
+			    read_batch ? "batch file" : "connection");
 			exit_cleanup(RERR_SYNTAX);
 		}
 		need_messages_from_generator = 1;