From 01242b256ce10120ebcaa993bb98cb381113b0cb Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Tue, 18 Jun 2024 08:11:53 -0700
Subject: [PATCH] Set committer name to include "aider" and restore original
 committer name after commit.

---
 aider/repo.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/aider/repo.py b/aider/repo.py
index 666a8f084..ba2ca4f3b 100644
--- a/aider/repo.py
+++ b/aider/repo.py
@@ -91,10 +91,21 @@ class GitRepo:
         else:
             cmd += ["-a"]
 
+        user_name = self.repo.config_reader().get_value("user", "name")
+        committer_name = f"{user_name} (aider)"
+        original_committer_name = os.environ.get("GIT_COMMITTER_NAME")
+        os.environ["GIT_COMMITTER_NAME"] = committer_name
+
         self.repo.git.commit(cmd)
         commit_hash = self.repo.head.commit.hexsha[:7]
         self.io.tool_output(f"Commit {commit_hash} {commit_message}")
 
+        # Restore the original GIT_COMMITTER_NAME
+        if original_committer_name is not None:
+            os.environ["GIT_COMMITTER_NAME"] = original_committer_name
+        else:
+            del os.environ["GIT_COMMITTER_NAME"]
+
         return commit_hash, commit_message
 
     def get_rel_repo_dir(self):