Merge branch 'main' of github.com:Aider-AI/aider

This commit is contained in:
Paul Gauthier 2025-01-04 11:09:25 -08:00
commit d9ef23ad99

View file

@ -285,9 +285,19 @@ class GitRepo:
files = self.tree_files[commit] files = self.tree_files[commit]
else: else:
try: try:
for blob in commit.tree.traverse(): iterator = commit.tree.traverse()
if blob.type == "blob": # blob is a file while True:
files.add(blob.path) try:
blob = next(iterator)
if blob.type == "blob": # blob is a file
files.add(blob.path)
except IndexError:
self.io.tool_warning(f"GitRepo: read error skipping {blob.path}")
continue
except ANY_GIT_ERROR as err:
raise err
except StopIteration:
break
except ANY_GIT_ERROR as err: except ANY_GIT_ERROR as err:
self.git_repo_error = err self.git_repo_error = err
self.io.tool_error(f"Unable to list files in git repo: {err}") self.io.tool_error(f"Unable to list files in git repo: {err}")