X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3b7bcaaf3477be6a50fde54e06b80c9a5e698bd9..e8e9e12c3ad227cb876680dd80de738cd5e376f9:/flist.c

diff --git a/flist.c b/flist.c
index de5f2929..6642cf27 100644
--- a/flist.c
+++ b/flist.c
@@ -2298,19 +2298,20 @@ static void clean_flist(struct file_list *flist, int strip_root)
 			int keep, drop;
 			/* If one is a dir and the other is not, we want to
 			 * keep the dir because it might have contents in the
-			 * list. */
+			 * list.  Otherwise keep the first one. */
 			if (S_ISDIR(file->mode)) {
 				struct file_struct *fp = flist->sorted[j];
 				if (!S_ISDIR(fp->mode))
 					keep = i, drop = j;
-				else
+				else {
+					if (am_sender)
+						file->flags |= FLAG_DUPLICATE;
 					keep = j, drop = i;
+				}
 			} else
 				keep = j, drop = i;
 
-			if (am_sender)
-				flist->sorted[drop]->flags |= FLAG_DUPLICATE;
-			else {
+			if (!am_sender) {
 				if (verbose > 1) {
 					rprintf(FINFO,
 					    "removing duplicate name %s from file list (%d)\n",