Commit 3a05c5d3 authored by Wayne Davison's avatar Wayne Davison

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.
parent 89ec535a
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment