config: resolve relative includes from relative config paths#2123

officialasishkumar

Summary

Normalize path-based config inputs before using them for include cycle detection.
Resolve relative include.path entries from that normalized source path when the root config file was supplied as a relative path.
Add regression coverage with a relative root config and a relative include cycle.

Testing

.venv/bin/pytest --no-cov -q test/test_config.py
.venv/bin/pytest --no-cov -q test/test_config.py test/test_repo.py::TestRepo::test_config_reader
.venv/bin/pytest --no-cov -q test/test_refs.py::TestRefs::test_set_tracking_branch_with_import
.venv/bin/ruff check git/config.py test/test_config.py
.venv/bin/ruff format --check git/config.py test/test_config.py
.venv/bin/mypy git/config.py
git diff --check

Copilot

Pull request overview

Fixes relative [include] path = ... handling when the root config file is provided as a relative path (regression for #2103), by normalizing config file paths for both include-cycle detection and relative-include resolution.

Changes:

Normalize initial config file inputs to absolute, normalized paths for include cycle detection.
Resolve relative include.path values using the normalized absolute source config path (instead of asserting the source path is already absolute).
Add a regression test covering a relative root config path with a relative include cycle.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description

git/config.py	Normalizes config paths for seen and uses an absolute source path to resolve relative include paths without asserting the caller provided an absolute root path.
test/test_config.py	Adds a regression test ensuring relative root config paths correctly resolve relative includes and avoid include-cycle failures.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Byron

It looks like Windows has problems, but that might point to some logic error.
There should also be a test that actually validates that cycle-detection, by putting one of the include files in a directory.

officialasishkumar

@Byron Added the nested-directory include cycle coverage in 483f0c6: the relative root config now includes subdir/b, and that nested file includes ../a. Validation passed with test/test_config.py, Ruff, mypy on git/config.py, and git diff --check.

One of the included files need to be in a subdirectory, and both need to be named "a" so the relative name is the same for an actual cycle check.

Byron

Windows still fails, also the cycle check isn't addressed. It seems like this is a bot account and I don't want to spend more time here.
Will close if the PR isn't green and has its issues addressed next time it comes out of draft.

Copilot AI review requested due to automatic review settings April 11, 2026 19:56

Copilot started reviewing on behalf of officialasishkumar April 11, 2026 19:57 View session

Copilot AI reviewed Apr 11, 2026

View reviewed changes

Byron requested changes Apr 12, 2026

View reviewed changes

officialasishkumar added 2 commits April 13, 2026 03:41

Test relative include cycles through nested paths

483f0c6

officialasishkumar force-pushed the fix-relative-config-include branch from 424760d to 483f0c6 Compare April 13, 2026 03:42

Byron marked this pull request as draft April 13, 2026 04:23

Byron reviewed Apr 13, 2026

View reviewed changes

Byron requested changes Apr 13, 2026

View reviewed changes

+                      fpa = osp.join(rw_dir, "a")
+                      nested_dir = osp.join(rw_dir, "subdir")
+                      os.makedirs(nested_dir)
+                      fpb = osp.join(nested_dir, "b")

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

config: resolve relative includes from relative config paths#2123