diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-05-20 08:54:58 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-05-20 08:54:59 +0900 |
commit | 33be431c0c7284c1adf0fe49f7838dbc8aee6ea9 (patch) | |
tree | ce7b37182ebe1c89b0d9d4f5ced18e514e60c09d /entry.c | |
parent | Merge branch 'ab/perl-makefile-cleanup' (diff) | |
parent | dir: introduce readdir_skip_dot_and_dotdot() helper (diff) | |
download | tgif-33be431c0c7284c1adf0fe49f7838dbc8aee6ea9.tar.xz |
Merge branch 'en/dir-traversal'
"git clean" and "git ls-files -i" had confusion around working on
or showing ignored paths inside an ignored directory, which has
been corrected.
* en/dir-traversal:
dir: introduce readdir_skip_dot_and_dotdot() helper
dir: update stale description of treat_directory()
dir: traverse into untracked directories if they may have ignored subfiles
dir: avoid unnecessary traversal into ignored directory
t3001, t7300: add testcase showcasing missed directory traversal
t7300: add testcase showing unnecessary traversal into ignored directory
ls-files: error out on -i unless -o or -c are specified
dir: report number of visited directories and paths with trace2
dir: convert trace calls to trace2 equivalents
Diffstat (limited to 'entry.c')
-rw-r--r-- | entry.c | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -58,12 +58,9 @@ static void remove_subtree(struct strbuf *path) if (!dir) die_errno("cannot opendir '%s'", path->buf); - while ((de = readdir(dir)) != NULL) { + while ((de = readdir_skip_dot_and_dotdot(dir)) != NULL) { struct stat st; - if (is_dot_or_dotdot(de->d_name)) - continue; - strbuf_addch(path, '/'); strbuf_addstr(path, de->d_name); if (lstat(path->buf, &st)) |