From 9f5765134b6cb54d7b584c1289e5cd71af908100 Mon Sep 17 00:00:00 2001
From: Akira Komamura <akira.komamura@gmail.com>
Date: Mon, 3 Mar 2025 18:14:42 +0900
Subject: [PATCH] fix: Use git command to get the identity

This takes the global git configuration into account, so it will become
unnecessary to set a local identity in every repository.
---
 aider/main.py | 13 ++-----------
 aider/repo.py |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/aider/main.py b/aider/main.py
index 76c9da478..b5627d767 100644
--- a/aider/main.py
+++ b/aider/main.py
@@ -126,17 +126,8 @@ def setup_git(git_root, io):
     if not repo:
         return
 
-    user_name = None
-    user_email = None
-    with repo.config_reader() as config:
-        try:
-            user_name = config.get_value("user", "name", None)
-        except (configparser.NoSectionError, configparser.NoOptionError):
-            pass
-        try:
-            user_email = config.get_value("user", "email", None)
-        except (configparser.NoSectionError, configparser.NoOptionError):
-            pass
+    user_name = repo.git.config("--default", "", "--get", "user.name") or None
+    user_email = repo.git.config("--default", "", "--get", "user.email") or None
 
     if user_name and user_email:
         return repo.working_tree_dir
diff --git a/aider/repo.py b/aider/repo.py
index a46a9f412..3e08f5f2a 100644
--- a/aider/repo.py
+++ b/aider/repo.py
@@ -145,7 +145,7 @@ class GitRepo:
         else:
             cmd += ["-a"]
 
-        original_user_name = self.repo.config_reader().get_value("user", "name")
+        original_user_name = self.repo.git.config("--get", "user.name")
         original_committer_name_env = os.environ.get("GIT_COMMITTER_NAME")
         committer_name = f"{original_user_name} (aider)"