From 033697d96db0d28fe7b68a191665a8db80375bdb Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Thu, 15 Sep 2011 07:40:50 -0700 Subject: [PATCH] Make --delete-excluded work better with --filter=merge. --- exclude.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/exclude.c b/exclude.c index 6101dda8..c8edec53 100644 --- 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; -- 2.47.3