refactor: simplify commit logic and use context manager for git env

Co-authored-by: aider (vertex_ai/gemini-2.5-pro-exp-03-25) <noreply@aider.dev>

aider/args.py

@@ -428,7 +428,10 @@ def get_parser(default_config_files, git_root):
         "--attribute-author",
         action=argparse.BooleanOptionalAction,
         default=True,
-        help="Attribute aider code changes in the git author name (default: True, ignored if attribute-co-authored-by is True unless explicitly set)",
+        help=(
+            "Attribute aider code changes in the git author name (default: True). This is ignored"
+            " if --attribute-co-authored-by is True."
+        ),
     )
     group.add_argument(
         "--attribute-committer",

aider/repo.py

@@ -1,3 +1,4 @@
+import contextlib
 import os
 import time
 from pathlib import Path, PurePosixPath
@@ -34,6 +35,19 @@ ANY_GIT_ERROR += [
 ANY_GIT_ERROR = tuple(ANY_GIT_ERROR)
 
 
+@contextlib.contextmanager
+def set_git_env(var_name, value, original_value):
+    """Temporarily set a Git environment variable."""
+    os.environ[var_name] = value
+    try:
+        yield
+    finally:
+        if original_value is not None:
+            os.environ[var_name] = original_value
+        elif var_name in os.environ:
+            del os.environ[var_name]
+
+
 class GitRepo:
     repo = None
     aider_ignore_file = None
@@ -139,37 +153,29 @@ class GitRepo:
             attribute_committer = self.attribute_committer
             attribute_commit_message_author = self.attribute_commit_message_author
             attribute_commit_message_committer = self.attribute_commit_message_committer
-            attribute_co_authored_by = getattr(self, 'attribute_co_authored_by', False)
+            attribute_co_authored_by = getattr(self, "attribute_co_authored_by", False)
 
-        commit_message_trailer = ""
-        prefix_commit_message = False
-        use_attribute_author = False
-        use_attribute_committer = False
-
-        if aider_edits:
         # Determine commit message prefixing
-            if attribute_commit_message_author or attribute_commit_message_committer:
+        prefix_commit_message = aider_edits and (
-                prefix_commit_message = True
+            attribute_commit_message_author or attribute_commit_message_committer
+        )
 
-            # Determine author/committer modification and trailer
+        # Determine Co-authored-by trailer
-
+        commit_message_trailer = ""
-            if attribute_co_authored_by:
+        if aider_edits and attribute_co_authored_by:
             model_name = "unknown-model"
             if coder and hasattr(coder, "main_model") and coder.main_model.name:
                 model_name = coder.main_model.name
-                commit_message_trailer = f"\n\nCo-authored-by: aider ({model_name}) <noreply@aider.dev>"
+            commit_message_trailer = (
-                # If co-authored-by is used, disable author/committer name modification
+                f"\n\nCo-authored-by: aider ({model_name}) <noreply@aider.dev>"
-                use_attribute_author = False
+            )
-                use_attribute_committer = False
+
-            else:
+        # Determine if author/committer names should be modified
-                # Original behavior when co-authored-by is false
+        # If co-authored-by is used for aider edits, it takes precedence over direct name modification.
-                use_attribute_author = attribute_author
+        use_attribute_author = attribute_author and aider_edits and not attribute_co_authored_by
-                use_attribute_committer = attribute_committer
+        use_attribute_committer = attribute_committer and not (
-        else: # not aider_edits
+            aider_edits and attribute_co_authored_by
-            # Keep original behavior for non-aider edits
+        )
-            use_attribute_author = False
-            use_attribute_committer = attribute_committer # Respect config for committer
-            prefix_commit_message = False # Don't prefix non-aider commits
 
         if not commit_message:
             commit_message = "(no commit message provided)"
@@ -178,8 +184,6 @@ class GitRepo:
             commit_message = "aider: " + commit_message
 
         full_commit_message = commit_message + commit_message_trailer
-        # if context:
-        #    full_commit_message += "\n\n# Aider chat conversation:\n\n" + context
 
         cmd = ["-m", full_commit_message]
         if not self.git_commit_verify:
@@ -200,32 +204,27 @@ class GitRepo:
         original_author_name_env = os.environ.get("GIT_AUTHOR_NAME")
         committer_name = f"{original_user_name} (aider)"
 
-        # Apply author/committer modifications based on flags determined earlier
-        if use_attribute_committer:
-            os.environ["GIT_COMMITTER_NAME"] = committer_name
-        if use_attribute_author:
-            os.environ["GIT_AUTHOR_NAME"] = committer_name
-
         try:
+            # Use context managers to handle environment variables
+            with contextlib.ExitStack() as stack:
+                if use_attribute_committer:
+                    stack.enter_context(
+                        set_git_env("GIT_COMMITTER_NAME", committer_name, original_committer_name_env)
+                    )
+                if use_attribute_author:
+                    stack.enter_context(
+                        set_git_env("GIT_AUTHOR_NAME", committer_name, original_author_name_env)
+                    )
+
+                # Perform the commit
                 self.repo.git.commit(cmd)
                 commit_hash = self.get_head_commit_sha(short=True)
                 self.io.tool_output(f"Commit {commit_hash} {commit_message}", bold=True)
                 return commit_hash, commit_message
+
         except ANY_GIT_ERROR as err:
             self.io.tool_error(f"Unable to commit: {err}")
-        finally:
+            # No return here, implicitly returns None
-            # Restore the env
-            if use_attribute_committer:
-                if original_committer_name_env is not None:
-                    os.environ["GIT_COMMITTER_NAME"] = original_committer_name_env
-                elif "GIT_COMMITTER_NAME" in os.environ:
-                    del os.environ["GIT_COMMITTER_NAME"]
-
-            if use_attribute_author:
-                if original_author_name_env is not None:
-                    os.environ["GIT_AUTHOR_NAME"] = original_author_name_env
-                elif "GIT_AUTHOR_NAME" in os.environ:
-                    del os.environ["GIT_AUTHOR_NAME"]
 
     def get_rel_repo_dir(self):
         try: