mirror of
https://github.com/RsyncProject/rsync.git
synced 2026-10-26 07:38:18 -04:00
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.
This commit is contained in:
1 parent
89ec535af5
commit
3a05c5d3ce
1 file changed
+3
-2
@@ -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);
|
||||
|
||||
|
||||
Reference in new issue
Block a user