From: Wayne Davison <wayned@samba.org>
Date: Fri, 27 May 2005 18:04:04 +0000 (+0000)
Subject: If we unduplicate '.', make sure we also copy FLAG_DEL_HERE (in
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/3a05c5d3ce89c1ef4c2f12646abb1afac418641a

If we unduplicate '.', make sure we also copy FLAG_DEL_HERE (in
addition to FLAG_TOP_DIR), so that the unduplication of a real
dir and an implied dir (implied by --relative) works right.
---

diff --git a/flist.c b/flist.c
index 5058cc5e..c342539e 100644
--- a/flist.c
+++ b/flist.c
@@ -1524,8 +1524,9 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 			}
 			/* Make sure that if we unduplicate '.', that we don't
 			 * lose track of a user-specified top directory. */
-			if (flist->files[drop]->flags & FLAG_TOP_DIR)
-				flist->files[keep]->flags |= FLAG_TOP_DIR;
+			j = flist->files[drop]->flags & (FLAG_TOP_DIR|FLAG_DEL_HERE);
+			if (j)
+				flist->files[keep]->flags |= j;
 
 			clear_file(drop, flist);