From 8f583ca1190db4a03605ad3d5634d02e45d2ffc8 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Mon, 23 Sep 2024 11:41:28 -0700 Subject: [PATCH] fix: Handle ValueError when getting relative path in ignored_file_raw --- aider/repo.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/aider/repo.py b/aider/repo.py index b0ff1dd91..f94a49198 100644 --- a/aider/repo.py +++ b/aider/repo.py @@ -344,7 +344,13 @@ class GitRepo: def ignored_file_raw(self, fname): if self.subtree_only: fname_path = Path(self.normalize_path(fname)) - cwd_path = Path.cwd().resolve().relative_to(Path(self.root).resolve()) + try: + cwd_path = Path.cwd().resolve().relative_to(Path(self.root).resolve()) + except ValueError: + # Issue #1524 + # ValueError: 'C:\\dev\\squid-certbot' is not in the subpath of 'C:\\dev\\squid-certbot + # Clearly, fname is not under cwd... so ignore it + return True if cwd_path not in fname_path.parents and fname_path != cwd_path: return True