This is a resend of the final two patches of my series, as per https://lore.kernel.org/git/xmqqfsyht49j.fsf@gitster.g/. It will not merge cleanly unless the last two patches of en/dir-traversal-fixes are first reverted, as Junio suggested he'd be doing. (Corrected Reviewed-by -> Signed-off-by in the first patch, minor stylistic fix for the second.) Derrick Stolee (1): dir: update stale description of treat_directory() Elijah Newren (1): dir: introduce readdir_skip_dot_and_dotdot() helper builtin/clean.c | 4 +--- builtin/worktree.c | 4 +--- diff-no-index.c | 5 ++--- dir.c | 38 ++++++++++++++++++++++---------------- dir.h | 2 ++ entry.c | 5 +---- notes-merge.c | 5 +---- object-file.c | 4 +--- packfile.c | 5 +---- rerere.c | 4 +--- worktree.c | 12 +++--------- 11 files changed, 36 insertions(+), 52 deletions(-) base-commit: dd55fc0df15c338a8dbec6dec6ca6b58edc8acef Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-961%2Fnewren%2Fdirectory-traversal-fixes-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-961/newren/directory-traversal-fixes-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/961 -- gitgitgadget