# search: Fix ignored file search in nested Git directories \(\#60772\) · gitcafe/zed

[View on GitCafe](https://git.cafe/gitcafe/zed/commit/55242071f11bee10e8af4e25b8a0f2bb8ce2b11e)

Repository: [gitcafe/zed](https://git.cafe/gitcafe/zed)

Visibility: public

Requested revision: 55242071f11bee10e8af4e25b8a0f2bb8ce2b11e

Requested commit: 55242071f11bee10e8af4e25b8a0f2bb8ce2b11e

Commit: 55242071f11bee10e8af4e25b8a0f2bb8ce2b11e

Tree: 41de92f3888fdbcbac3ef76c4ee33c1bf099ca1b

Author: Vitaly Slobodin

Committer: GitHub

## Message

````
search: Fix ignored file search in nested Git directories (#60772)

# Objective

- Fix ignored file search in nested Git directories (even just empty
`.git` directories, not real git repositories)
- Fixes #52328

## Solution

Keep parent ignore rules when rebuilding a nested repository's ignore
stack. This hides root-ignored files again after excluded-file search is
turned off, without breaking global ignore handling.

For example:

```ascii
project/
├── .git/
├── .gitignore    # log/
├── app/
│   └── a.txt     # hello
└── log/
    ├── .git/     # nested repository marker
    └── b.txt     # hello
```

Both `a.txt` and `b.txt` have string `hello`.
Initially, searching for `hello` returns only `a.txt`. Enabling `Also
search files ignored by configuration` rescans `log/` and returns both
files.
Before this change, disabling the option still
returned both files because the rescan dropped the parent `.gitignore`
and marked `b.txt` as included.

## Testing

- Did you test these changes? If so, how?

To test changes in this pull request create a simple project with the
following dir structure:

   ```
   .git
   .gitignore
   a/a.txt
   b/b.txt
   b/.git  # this is an empty directory
   ```

   Add `b` folder as an ignore entry to the `.gitignore` file: `b/`

- Are there any parts that need more testing?

   No

- How can other people (reviewers) test your changes? Is there anything
specific they need to know?

   Use the test scenario above

- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?

   macOS

## Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content adheres to Zed's UI standards
([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
and
[icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md)
guidelines)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

## Showcase

By using the structure above here is how it works before changes here:



https://github.com/user-attachments/assets/2028123e-388e-4390-b131-ddf4642ab5f3

Notice that `hello` string from file `b.txt` is listed in search results
regardless of the option `Include excluded files`

And here is after:



https://github.com/user-attachments/assets/99c627a2-e16a-4fdd-979b-2e0bacbd827d



Notice that `hello` string from file `b.txt` is **not** listed in search
results when the option `Include excluded files` is disabled.

Release Notes:

- Fixed ignored file search in nested Git directories
````

## Parents

- [8c4550cb95d88a1841a1d6cfcf5e092d313745a1](https://git.cafe/gitcafe/zed/commit/8c4550cb95d88a1841a1d6cfcf5e092d313745a1?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zed/tree/55242071f11bee10e8af4e25b8a0f2bb8ce2b11e?format=markdown)