Fix git credentials for merging

Author: amrit110

src/aieng_bot_maintain/auto_merger/workflow_client.py

@@ -265,7 +265,7 @@ def _manual_rebase(self, pr: PRQueueItem) -> bool:
                     env=env,
                 )
 
-                # Configure git user and credentials for commits
+                # Configure git user for commits
                 subprocess.run(
                     ["git", "config", "user.name", "aieng-bot-maintain[bot]"],
                     cwd=repo_dir,
@@ -284,21 +284,8 @@ def _manual_rebase(self, pr: PRQueueItem) -> bool:
                     capture_output=True,
                 )
 
-                # Configure git to use GH_TOKEN for authentication
-                # This sets up credential helper to use the token for HTTPS pushes
-                subprocess.run(
-                    [
-                        "git",
-                        "config",
-                        "credential.helper",
-                        "store --file=/dev/null",  # Don't persist credentials
-                    ],
-                    cwd=repo_dir,
-                    check=True,
-                    capture_output=True,
-                )
-
                 # Set remote URL to include token for authentication
+                # Using x-access-token in URL provides auth without credential helper
                 remote_url = (
                     f"https://x-access-token:{self.gh_token}@github.com/{pr.repo}.git"
                 )

tests/auto_merger/test_workflow_client.py

@@ -217,9 +217,7 @@ def test_trigger_rebase_precommit_success(
             MagicMock(returncode=0, stdout=""),
             # git config user.email
             MagicMock(returncode=0, stdout=""),
-            # git config credential.helper
-            MagicMock(returncode=0, stdout=""),
-            # git remote set-url
+            # git remote set-url (embeds token in URL for auth)
             MagicMock(returncode=0, stdout=""),
             # git fetch origin head_ref
             MagicMock(returncode=0, stdout=""),
@@ -237,7 +235,7 @@ def test_trigger_rebase_precommit_success(
 
         assert result is True
         # Should make multiple git-related calls
-        assert mock_run.call_count == 11
+        assert mock_run.call_count == 10
 
     @patch("subprocess.run")
     def test_trigger_rebase_precommit_failure(
@@ -257,8 +255,6 @@ def test_trigger_rebase_precommit_failure(
             MagicMock(returncode=0, stdout=""),
             # git config user.email
             MagicMock(returncode=0, stdout=""),
-            # git config credential.helper
-            MagicMock(returncode=0, stdout=""),
             # git remote set-url
             MagicMock(returncode=0, stdout=""),
             # git fetch origin head_ref