If someone forces the use of qsort() via --qsort, disable incremental

recursion (at least for now).

diff --git a/compat.c b/compat.c
index c5eee15..527485d 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -31,6 +31,7 @@ extern int am_sender;
 extern int local_server;
 extern int inplace;
 extern int recurse;
+extern int use_qsort;
 extern int allow_inc_recurse;
 extern int fuzzy_basis;
 extern int read_batch;
@@ -205,7 +206,7 @@ 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)
+                && !prune_empty_dirs && !use_qsort)
                        inc_recurse = 1;
                need_messages_from_generator = 1;
        }