A slightly better fix than the last one (though it won't make any

[rsync/rsync.git] / exclude.c

diff --git a/exclude.c b/exclude.c
index f2be6a9..36faa96 100644 (file)
--- a/exclude.c
+++ b/exclude.c
@@ -1105,9 +1105,9 @@ static void send_rules(int f_out, struct filter_list_struct *flp)
                        continue;
                if (ent->match_flags & MATCHFLG_CVS_IGNORE
                    && !(ent->match_flags & MATCHFLG_MERGE_FILE)) {
-                       int f = am_sender || protocol_version < 29 ? f_out : -1;
+                       int f = am_sender || protocol_version < 29 ? f_out : -2;
                        send_rules(f, &cvs_filter_list);
-                       if (f >= 0 || f_out < 0)
+                       if (f == f_out)
                                continue;
                }
                p = get_rule_prefix(ent->match_flags, ent->pattern, 1, &plen);