Apply upstream changeset fa9e61:
Fix --one-file-system to include the directory encountered rather than excluding it.