[PATCH v4 4/4] new: Unify add_files and add_files_recursive