From cef78282bd7acd783297cf666ee6bf39da3156a2 Mon Sep 17 00:00:00 2001
From: "Paul Gauthier (aider)" <aider@paulg.org>
Date: Wed, 4 Sep 2024 08:52:11 -0700
Subject: [PATCH] feat: add error handling for git operations in auto_commit
 method

---
 aider/coders/base_coder.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index 5e818e56b..44a2774a4 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -1859,17 +1859,21 @@ class Coder:
         if not context:
             context = self.get_context_from_history(self.cur_messages)
 
-        res = self.repo.commit(fnames=edited, context=context, aider_edits=True)
-        if res:
-            self.show_auto_commit_outcome(res)
-            commit_hash, commit_message = res
-            return self.gpt_prompts.files_content_gpt_edits.format(
-                hash=commit_hash,
-                message=commit_message,
-            )
+        try:
+            res = self.repo.commit(fnames=edited, context=context, aider_edits=True)
+            if res:
+                self.show_auto_commit_outcome(res)
+                commit_hash, commit_message = res
+                return self.gpt_prompts.files_content_gpt_edits.format(
+                    hash=commit_hash,
+                    message=commit_message,
+                )
 
-        self.io.tool_output("No changes made to git tracked files.")
-        return self.gpt_prompts.files_content_gpt_no_edits
+            self.io.tool_output("No changes made to git tracked files.")
+            return self.gpt_prompts.files_content_gpt_no_edits
+        except ANY_GIT_ERROR as err:
+            self.io.tool_error(f"Git error during auto-commit: {str(err)}")
+            return None
 
     def show_auto_commit_outcome(self, res):
         commit_hash, commit_message = res