Skip to content

fix: validate .git directories in find_vcs_root()#4610

Merged
alisonlhart merged 3 commits intoansible:mainfrom
skeetmtp:fix/validate-git-dir-in-find-vcs-root
Feb 16, 2026
Merged

fix: validate .git directories in find_vcs_root()#4610
alisonlhart merged 3 commits intoansible:mainfrom
skeetmtp:fix/validate-git-dir-in-find-vcs-root

Conversation

@skeetmtp
Copy link
Contributor

Summary

  • Spurious .git/ directories created by tools like GitKraken (containing only tool-specific metadata such as .git/gk/) caused find_vcs_root() to stop its upward directory walk too early, breaking config file discovery from subdirectories.
  • Added a _is_valid_vcs_dir() helper that checks for .git/HEAD — the universal marker present in every valid git repository (regular, bare, and worktree) — before accepting a .git directory as a genuine repo root.
  • Added a test that creates a fake GitKraken-style .git directory and verifies it is skipped in favor of the real repo root.

Test plan

  • Existing lookup_config_file and find_vcs_root tests pass
  • New test_find_vcs_root_skips_fake_git_dir test passes
  • Full tests/unit/test_util.py suite passes (82 tests)

Sent from my Claude Code

Spurious .git/ directories created by tools like GitKraken (containing
only tool-specific metadata such as .git/gk/) caused find_vcs_root()
to stop its upward directory walk too early, breaking config file
discovery from subdirectories.

Check for .git/HEAD — the universal marker present in every valid git
repository (regular, bare, and worktree) — before accepting a .git
directory as a genuine repo root.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@skeetmtp skeetmtp force-pushed the fix/validate-git-dir-in-find-vcs-root branch from 0468b30 to 84148f0 Compare February 16, 2026 13:12
@github-actions github-actions bot added fix and removed fix labels Feb 16, 2026
@alisonlhart
Copy link
Contributor

Thanks @skeetmtp for this fix!

@alisonlhart alisonlhart enabled auto-merge (squash) February 16, 2026 16:23
@github-actions github-actions bot added fix and removed fix labels Feb 16, 2026
@alisonlhart alisonlhart merged commit 9c2b145 into ansible:main Feb 16, 2026
19 checks passed
rija added a commit to rmenage/ansible-role-hardened-docker that referenced this pull request Mar 3, 2026
This MR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [molecule](https://github.com/ansible-community/molecule) ([changelog](https://github.com/ansible-community/molecule/releases)) | `>=25.0.0,<26.0.0` → `>=26.2.0,<26.3.0` | ![age](https://developer.mend.io/api/mc/badges/age/pypi/molecule/26.2.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/molecule/25.12.0/26.2.0?slim=true) |

---

### Release Notes

<details>
<summary>ansible-community/molecule (molecule)</summary>

### [`v26.2.0`](https://github.com/ansible/molecule/releases/tag/v26.2.0)

[Compare Source](ansible/molecule@v25.12.0...v26.2.0)

#### Features

- feat: improve scenario selection and filtering for large collection trees ([#&#8203;4613](ansible/molecule#4613)) [@&#8203;cidrblock](https://github.com/cidrblock)
- feat: support nested scenario directories in collection mode ([#&#8203;4611](ansible/molecule#4611)) [@&#8203;cidrblock](https://github.com/cidrblock)

#### Fixes

- fix: remove use of click-help-colors ([#&#8203;4569](ansible/molecule#4569)) [@&#8203;ssbarnea](https://github.com/ssbarnea)
- fix: validate .git directories in find\_vcs\_root() ([#&#8203;4610](ansible/molecule#4610)) [@&#8203;skeetmtp](https://github.com/skeetmtp)
- fix: handle missing molecule\_yml\_date\_modified key in state ([#&#8203;4606](ansible/molecule#4606)) [@&#8203;dmzoneill](https://github.com/dmzoneill)
- Add execution flow documentation ([#&#8203;4589](ansible/molecule#4589)) [@&#8203;Qalthos](https://github.com/Qalthos)
- Modify contact links in issue template config ([#&#8203;4586](ansible/molecule#4586)) [@&#8203;alisonlhart](https://github.com/alisonlhart)

#### Maintenance

- chore(deps): update all dependencies ([#&#8203;4612](ansible/molecule#4612)) @&#8203;[renovate\[bot\]](https://github.com/apps/renovate)
- chore: replace pre-commit with prek ([#&#8203;4614](ansible/molecule#4614)) [@&#8203;ssbarnea](https://github.com/ssbarnea)
- chore: use tox>=4.46.0 during testing ([#&#8203;4615](ansible/molecule#4615)) [@&#8203;ssbarnea](https://github.com/ssbarnea)
- chore(deps): update pep621 ([#&#8203;4609](ansible/molecule#4609)) @&#8203;[renovate\[bot\]](https://github.com/apps/renovate)
- Bump cryptography from 46.0.4 to 46.0.5 ([#&#8203;4604](ansible/molecule#4604)) @&#8203;[dependabot\[bot\]](https://github.com/apps/dependabot)
- Bump pillow from 12.1.0 to 12.1.1 ([#&#8203;4605](ansible/molecule#4605)) @&#8203;[dependabot\[bot\]](https://github.com/apps/dependabot)
- chore(deps): update all dependencies ([#&#8203;4608](ansible/molecule#4608)) @&#8203;[renovate\[bot\]](https://github.com/apps/renovate)
- chore(deps): update all dependencies ([#&#8203;4603](ansible/molecule#4603)) @&#8203;[renovate\[bot\]](https://github.com/apps/renovate)
- chore(deps): update all dependencies ([#&#8203;4599](ansible/molecule#4599)) @&#8203;[renovate\[bot\]](https://github.com/apps/renovate)
- chore(deps): update dependencies \[security] ([#&#8203;4601](ansible/molecule#4601)) @&#8203;[renovate\[bot\]](https://github.com/apps/renovate)
- chore(deps): update all dependencies ([#&#8203;4598](ansible/molecule#4598)) @&#8203;[renovate\[bot\]](https://github.com/apps/renovate)
- chore(deps): update all dependencies ([#&#8203;4595](ansible/molecule#4595)) @&#8203;[renovate\[bot\]](https://github.com/apps/renovate)
- chore(deps): update all dependencies ([#&#8203;4594](ansible/molecule#4594)) @&#8203;[renovate\[bot\]](https://github.com/apps/renovate)
- chore(deps): update all dependencies ([#&#8203;4593](ansible/molecule#4593)) @&#8203;[renovate\[bot\]](https://github.com/apps/renovate)
- chore(deps): update all dependencies ([#&#8203;4592](ansible/molecule#4592)) @&#8203;[renovate\[bot\]](https://github.com/apps/renovate)
- chore(deps): update all dependencies ([#&#8203;4591](ansible/molecule#4591)) @&#8203;[renovate\[bot\]](https://github.com/apps/renovate)
- chore(deps): update all dependencies ([#&#8203;4590](ansible/molecule#4590)) @&#8203;[renovate\[bot\]](https://github.com/apps/renovate)
- chore(deps): update all dependencies ([#&#8203;4587](ansible/molecule#4587)) @&#8203;[renovate\[bot\]](https://github.com/apps/renovate)
- chore: adopt pytest>=9.0.0 config ([#&#8203;4583](ansible/molecule#4583)) [@&#8203;Qalthos](https://github.com/Qalthos)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this MR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box

---

This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi45OS4wIiwidXBkYXRlZEluVmVyIjoiNDIuOTkuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->


Refs:  rmenage/ansible-role-hardened-docker!23
See-also:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

2 participants