dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-06-01 02:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'main' of github.com:Aider-AI/aider

Browse source
This commit is contained in:
Paul Gauthier 2025-03-05 16:29:50 -08:00
commit 77e5882ce7
2 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
aider/main.py
View file

@ -126,17 +126,8 @@ def setup_git(git_root, io):
if not repo: if not repo:
return return
user_name = None user_name = repo.git.config("--default", "", "--get", "user.name") or None
user_email = None user_email = repo.git.config("--default", "", "--get", "user.email") or 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
if user_name and user_email: if user_name and user_email:
return repo.working_tree_dir return repo.working_tree_dir

2
aider/repo.py
View file

@ -145,7 +145,7 @@ class GitRepo:
else: else:
cmd += ["-a"] 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") original_committer_name_env = os.environ.get("GIT_COMMITTER_NAME")
committer_name = f"{original_user_name} (aider)" committer_name = f"{original_user_name} (aider)"