From: René Scharfe Date: Fri, 18 Sep 2026 11:04:06 GMT Subject: [PATCH] dir: skip excluded directory with nested repo on prefix match Message-ID: In-Reply-To: <87ld94klhf.fsf@athena.silentflame.com> 95c11ecc73 (Fix error-prone fill_directory() API; make it only return matches, 2020-04-01) optimized away pathspec matching too eagerly and cada7308ad (dir: check pathspecs before returning `path_excluded`, 2020-07-20) fixed that for files and symlinks. A corner case remained unaddressed: Ignored directories that contain a nested repository. Make sure to run match_pathspec_with_flags() for it if necessary. Reported-by: Sean Whitton Reported-by: Lester Longley Signed-off-by: René Scharfe --- dir.c | 25 ++++++++++++++++++------- t/t7061-wtstatus-ignore.sh | 5 +++++ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dir.c b/dir.c index 95d8a1cce9..0557a59d5e 100644 --- a/dir.c +++ b/dir.c @@ -1930,6 +1930,16 @@ static enum exist_status directory_exists_in_index(struct index_state *istate, return index_nonexistent; } +static int dir_match(struct index_state *istate, + const struct pathspec *pathspec, + const char *dirname, int len) +{ + return match_pathspec_with_flags(istate, pathspec, dirname, len, + 0 /* prefix */, + NULL /* seen */, + DO_MATCH_LEADING_PATHSPEC); +} + /* * When we find a directory when traversing the filesystem, we * have three distinct cases: @@ -1996,11 +2006,7 @@ static enum path_treatment treat_directory(struct dir_struct *dir, * for matching patterns. */ if (pathspec && !excluded) { - matches_how = match_pathspec_with_flags(istate, pathspec, - dirname, len, - 0 /* prefix */, - NULL /* seen */, - DO_MATCH_LEADING_PATHSPEC); + matches_how = dir_match(istate, pathspec, dirname, len); if (!matches_how) return path_none; } @@ -2034,8 +2040,13 @@ static enum path_treatment treat_directory(struct dir_struct *dir, strbuf_release(&sb); if (nested_repo) { - if ((dir->flags & DIR_SKIP_NESTED_GIT) || - (matches_how == MATCHED_RECURSIVELY_LEADING_PATHSPEC)) + if (dir->flags & DIR_SKIP_NESTED_GIT) + return path_none; + if (!matches_how) + matches_how = dir_match(istate, pathspec, + dirname, len); + if (!matches_how || + matches_how == MATCHED_RECURSIVELY_LEADING_PATHSPEC) return path_none; return excluded ? path_excluded : path_untracked; } diff --git a/t/t7061-wtstatus-ignore.sh b/t/t7061-wtstatus-ignore.sh index 14ddaba2f3..182933471f 100755 --- a/t/t7061-wtstatus-ignore.sh +++ b/t/t7061-wtstatus-ignore.sh @@ -340,4 +340,9 @@ test_expect_success 'status ignores submodule in excluded directory' ' test_cmp expected actual ' +test_expect_success 'status omits excluded directory with submodule on prefix match' ' + git status --porcelain --ignored -u tracke >actual && + test_must_be_empty actual +' + test_done -- 2.55.0