From c32a991b2cd32878d7d1e772c037ed234a09f3b0 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Sat, 31 Aug 2024 08:21:07 -0700
Subject: [PATCH] use git.exc not gitdb.exc

---
 aider/main.py | 3 +--
 aider/repo.py | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/aider/main.py b/aider/main.py
index 184974d29..63d25937d 100644
--- a/aider/main.py
+++ b/aider/main.py
@@ -6,7 +6,6 @@ import threading
 from pathlib import Path
 
 import git
-import gitdb
 from dotenv import load_dotenv
 from prompt_toolkit.enums import EditingMode
 
@@ -57,7 +56,7 @@ def make_new_repo(git_root, io):
     try:
         repo = git.Repo.init(git_root)
         check_gitignore(git_root, io, False)
-    except (gitdb.exc.ODBError, git.exc.GitCommandNotFound) as err:  # issue #1233
+    except (git.exc.ODBError, git.exc.GitCommandNotFound) as err:  # issue #1233
         io.tool_error(f"Unable to create git repo in {git_root}")
         io.tool_error(str(err))
         return
diff --git a/aider/repo.py b/aider/repo.py
index 07399e7cd..eb21b4c74 100644
--- a/aider/repo.py
+++ b/aider/repo.py
@@ -3,7 +3,6 @@ import time
 from pathlib import Path, PurePosixPath
 
 import git
-import gitdb
 import pathspec
 
 from aider import prompts, utils
@@ -376,7 +375,7 @@ class GitRepo:
     def get_head_commit(self):
         try:
             return self.repo.head.commit
-        except (ValueError, gitdb.exc.ODBError):
+        except (ValueError, git.exc.ODBError):
             return None
 
     def get_head_commit_sha(self, short=False):