Make --delete-excluded work better with --filter=merge.

diff --git a/exclude.c b/exclude.c
index 6101dda833a1b8bd0c093016a7f65995141af03f..c8edec53c1f466e0ee45ba647100778f5e9bfc17 100644 (file)
--- a/exclude.c
+++ b/exclude.c
@@ -901,13 +901,9 @@ static const char *parse_rule_tok(const char *p, uint32 mflags, int xflags,
                exit_cleanup(RERR_SYNTAX);
        }
 
-       /* --delete-excluded turns an un-modified include/exclude into a
-        * sender-side rule.  We also affect per-dir merge files that take
-        * no prefixes as a simple optimization. */
+       /* --delete-excluded turns an un-modified include/exclude into a sender-side rule. */
        if (delete_excluded
-        && !(new_mflags & (MATCHFLG_RECEIVER_SIDE|MATCHFLG_SENDER_SIDE))
-        && (!(new_mflags & MATCHFLG_PERDIR_MERGE)
-         || new_mflags & MATCHFLG_NO_PREFIXES))
+        && !(new_mflags & (MATCHFLG_RECEIVER_SIDE|MATCHFLG_SENDER_SIDE|MATCHFLG_MERGE_FILE|MATCHFLG_PERDIR_MERGE)))
                new_mflags |= MATCHFLG_SENDER_SIDE;
 
        *len_ptr = len;