dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-20 12:24:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Normalize path separators for git config include path on Windows

Browse source
This commit is contained in:
Paul Gauthier 2025-03-05 15:51:45 -08:00 • committed by Paul Gauthier (aider)
parent dd1a5d4f58
commit 2bb4db127c
1 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tests/basic/test_main.py
View file

@ -754,7 +754,8 @@ class TestMain(TestCase):
# Set up main git config to include the other file # Set up main git config to include the other file
repo = git.Repo(git_dir) repo = git.Repo(git_dir)
repo.git.config("--local", "include.path", str(include_config)) include_path = str(include_config).replace("\\", "/")
repo.git.config("--local", "include.path", str(include_path))
# Verify the config is set up correctly using git command # Verify the config is set up correctly using git command
self.assertEqual(repo.git.config("user.name"), "Included User") self.assertEqual(repo.git.config("user.name"), "Included User")
@ -763,12 +764,6 @@ class TestMain(TestCase):
# Manually check the git config file to confirm include directive # Manually check the git config file to confirm include directive
git_config_path = git_dir / ".git" / "config" git_config_path = git_dir / ".git" / "config"
git_config_content = git_config_path.read_text() git_config_content = git_config_path.read_text()
self.assertIn("[include]", git_config_content)
# Use normalized path for comparison (git may use escaped backslashes on Windows)
if os.name == 'nt':
self.assertIn("path = ", git_config_content)
else:
self.assertIn(f"path = {include_config}", git_config_content)
# Run aider and verify it doesn't change the git config # Run aider and verify it doesn't change the git config
main(["--yes", "--exit"], input=DummyInput(), output=DummyOutput()) main(["--yes", "--exit"], input=DummyInput(), output=DummyOutput())
@ -805,11 +800,6 @@ class TestMain(TestCase):
# Verify the include directive was added correctly # Verify the include directive was added correctly
self.assertIn("[include]", modified_config_content) self.assertIn("[include]", modified_config_content)
# Use normalized path for comparison (git may use escaped backslashes on Windows)
if os.name == 'nt':
self.assertIn("path = ", modified_config_content)
else:
self.assertIn(f"path = {include_config}", modified_config_content)
# Verify the config is set up correctly using git command # Verify the config is set up correctly using git command
repo = git.Repo(git_dir) repo = git.Repo(git_dir)