Commit 0f0b2e66 authored by Wayne Davison's avatar Wayne Davison

Simplified the last change a bit.

parent 5d24ee71
...@@ -1524,9 +1524,8 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) ...@@ -1524,9 +1524,8 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
} }
/* Make sure that if we unduplicate '.', that we don't /* Make sure that if we unduplicate '.', that we don't
* lose track of a user-specified top directory. */ * lose track of a user-specified top directory. */
j = flist->files[drop]->flags & (FLAG_TOP_DIR|FLAG_DEL_HERE); flist->files[keep]->flags |= flist->files[drop]->flags
if (j) & (FLAG_TOP_DIR|FLAG_DEL_HERE);
flist->files[keep]->flags |= j;
clear_file(drop, flist); 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