From 3417881d5cf5358faa9484fb487775f0e8b14556 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 16b2a562..faa860ff 100644 --- a/exclude.c +++ b/exclude.c @@ -1013,13 +1013,9 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr, 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 - && !(rule->rflags & FILTRULES_SIDES) - && (!(rule->rflags & FILTRULE_PERDIR_MERGE) - || rule->rflags & FILTRULE_NO_PREFIXES)) + && !(rule->rflags & (FILTRULES_SIDES|FILTRULE_MERGE_FILE|FILTRULE_PERDIR_MERGE))) rule->rflags |= FILTRULE_SENDER_SIDE; *pat_ptr = (const char *)s; -- 2.47.2