diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index 45758a63d..120a7f22c 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -150,7 +150,11 @@ class Coder:
         if use_git:
             try:
                 self.repo = GitRepo(
-                    self.io, fnames, git_dname, aider_ignore_file, client=self.client
+                    self.io,
+                    fnames,
+                    git_dname,
+                    aider_ignore_file,
+                    models=main_model.commit_message_models(),
                 )
                 self.root = self.repo.root
             except FileNotFoundError:
diff --git a/aider/repo.py b/aider/repo.py
index cab1f7606..f777af080 100644
--- a/aider/repo.py
+++ b/aider/repo.py
@@ -4,7 +4,7 @@ from pathlib import Path, PurePosixPath
 import git
 import pathspec
 
-from aider import models, prompts, utils
+from aider import prompts, utils
 from aider.sendchat import simple_send_with_retries
 
 from .dump import dump  # noqa: F401
@@ -16,9 +16,9 @@ class GitRepo:
     aider_ignore_spec = None
     aider_ignore_ts = 0
 
-    def __init__(self, io, fnames, git_dname, aider_ignore_file=None, client=None):
-        self.client = client
+    def __init__(self, io, fnames, git_dname, aider_ignore_file=None, models=None):
         self.io = io
+        self.models = models
 
         if git_dname:
             check_fnames = [git_dname]
@@ -120,8 +120,8 @@ class GitRepo:
             dict(role="user", content=content),
         ]
 
-        for model in models.Model.commit_message_models():
-            commit_message = simple_send_with_retries(self.client, model.name, messages)
+        for model in self.models:
+            commit_message = simple_send_with_retries(None, model.name, messages)
             if commit_message:
                 break