From 229e8e1ad1941a38ea8a33e82998610b4fcb81cf Mon Sep 17 00:00:00 2001
From: Paul Gauthier <paul@aider.chat>
Date: Thu, 6 Feb 2025 14:15:09 -0800
Subject: [PATCH] refactor: Update file addition confirmation message and add
 TimeoutError to git error handling

---
 aider/coders/base_coder.py | 4 +++-
 aider/repo.py              | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index 287bd9685..1818bca01 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -1597,7 +1597,9 @@ class Coder:
         added_fnames = []
         group = ConfirmGroup(new_mentions)
         for rel_fname in sorted(new_mentions):
-            if self.io.confirm_ask(f"Add {rel_fname} to the chat?", group=group, allow_never=True):
+            if self.io.confirm_ask(
+                f"Add file to the chat?", subject=rel_fname, group=group, allow_never=True
+            ):
                 self.add_rel_fname(rel_fname)
                 added_fnames.append(rel_fname)
             else:
diff --git a/aider/repo.py b/aider/repo.py
index 50fe793df..a46a9f412 100644
--- a/aider/repo.py
+++ b/aider/repo.py
@@ -28,6 +28,7 @@ ANY_GIT_ERROR += [
     ValueError,
     AttributeError,
     AssertionError,
+    TimeoutError,
 ]
 ANY_GIT_ERROR = tuple(ANY_GIT_ERROR)