fix: properly use GitPython subcommands

Author: NicolasIRAGNE

Dockerfile

@@ -13,7 +13,7 @@ COPY src/ ./src/
 
 RUN set -eux; \
     pip install --no-cache-dir --upgrade pip; \
-    pip install --no-cache-dir --timeout 1000 .[server]
+    pip install --no-cache-dir --timeout 1000 .[server,mcp]
 
 # Stage 2: Runtime image
 FROM python:3.13.5-slim@sha256:4c2cf9917bd1cbacc5e9b07320025bdb7cdf2df7b0ceaccb55e9dd7e30987419

src/gitingest/clone.py

@@ -5,13 +5,13 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from gitingest.config import DEFAULT_TIMEOUT
 import git
+
+from gitingest.config import DEFAULT_TIMEOUT
 from gitingest.utils.git_utils import (
     _add_token_to_url,
     check_repo_exists,
     checkout_partial_clone,
-    create_git_auth_header,
     create_git_repo,
     ensure_git_installed,
     is_github_host,
@@ -97,19 +97,19 @@ async def clone_repo(config: CloneConfig, *, token: str | None = None) -> None:
             "no_checkout": True,
             "depth": 1,
         }
-        
+
         if partial_clone:
             # GitPython doesn't directly support --filter and --sparse in clone
             # We'll need to use git.Git() for the initial clone with these options
             git_cmd = git.Git()
-            cmd_args = ["clone", "--single-branch", "--no-checkout", "--depth=1"]
+            cmd_args = ["--single-branch", "--no-checkout", "--depth=1"]
             if partial_clone:
                 cmd_args.extend(["--filter=blob:none", "--sparse"])
             cmd_args.extend([clone_url, local_path])
-            git_cmd.execute(cmd_args)
+            git_cmd.clone(*cmd_args)
         else:
             git.Repo.clone_from(clone_url, local_path, **clone_kwargs)
-            
+
         logger.info("Git clone completed successfully")
     except git.GitCommandError as exc:
         msg = f"Git clone failed: {exc}"
@@ -124,7 +124,7 @@ async def clone_repo(config: CloneConfig, *, token: str | None = None) -> None:
     # Create repo object and perform operations
     try:
         repo = create_git_repo(local_path, url, token)
-        
+
         # Ensure the commit is locally available
         logger.debug("Fetching specific commit", extra={"commit": commit})
         repo.git.fetch("--depth=1", "origin", commit)

src/gitingest/utils/git_utils.py

@@ -368,7 +368,7 @@ async def checkout_partial_clone(config: CloneConfig, token: str | None) -> None
 
     try:
         repo = create_git_repo(config.local_path, config.url, token)
-        repo.git.execute(["sparse-checkout", "set", subpath])
+        repo.git.sparse_checkout("set", subpath)
     except git.GitCommandError as exc:
         msg = f"Failed to configure sparse-checkout: {exc}"
         raise RuntimeError(msg) from exc

tests/conftest.py

@@ -235,6 +235,8 @@ def _setup_gitpython_mocks(mocker: MockerFixture) -> dict[str, MagicMock]:
     mock_git_cmd.version.return_value = "git version 2.34.1"
     mock_git_cmd.config.return_value = "true"
     mock_git_cmd.execute.return_value = f"{DEMO_COMMIT}\trefs/heads/main\n"
+    mock_git_cmd.ls_remote.return_value = f"{DEMO_COMMIT}\trefs/heads/main\n"
+    mock_git_cmd.clone.return_value = ""
 
     # Mock git.Repo class
     mock_repo = MagicMock()
@@ -244,6 +246,7 @@ def _setup_gitpython_mocks(mocker: MockerFixture) -> dict[str, MagicMock]:
     mock_repo.git.submodule = MagicMock()
     mock_repo.git.execute = MagicMock()
     mock_repo.git.config = MagicMock()
+    mock_repo.git.sparse_checkout = MagicMock()
 
     # Mock git.Repo.clone_from
     mock_clone_from = MagicMock(return_value=mock_repo)

tests/test_clone.py

@@ -35,14 +35,13 @@
 
 
 @pytest.mark.asyncio
-async def test_clone_with_commit(repo_exists_true: AsyncMock, run_command_mock: AsyncMock) -> None:
+async def test_clone_with_commit(repo_exists_true: AsyncMock, gitpython_mocks: dict) -> None:
     """Test cloning a repository with a specific commit hash.
 
     Given a valid URL and a commit hash:
     When ``clone_repo`` is called,
     Then the repository should be cloned and checked out at that commit.
     """
-    expected_call_count = GIT_INSTALLED_CALLS + 3  # ensure_git_installed + clone + fetch + checkout
     commit_hash = "a" * 40  # Simulating a valid commit hash
     clone_config = CloneConfig(
         url=DEMO_URL,
@@ -54,8 +53,21 @@ async def test_clone_with_commit(repo_exists_true: AsyncMock, run_command_mock:
     await clone_repo(clone_config)
 
     repo_exists_true.assert_any_call(clone_config.url, token=None)
-    assert_standard_calls(run_command_mock, clone_config, commit=commit_hash)
-    assert run_command_mock.call_count == expected_call_count
+    
+    # Verify GitPython calls were made
+    mock_git_cmd = gitpython_mocks["git_cmd"]
+    mock_repo = gitpython_mocks["repo"]
+    mock_clone_from = gitpython_mocks["clone_from"]
+    
+    # Should have called version (for ensure_git_installed)
+    mock_git_cmd.version.assert_called()
+    
+    # Should have called clone_from (since partial_clone=False)
+    mock_clone_from.assert_called_once()
+    
+    # Should have called fetch and checkout on the repo
+    mock_repo.git.fetch.assert_called()
+    mock_repo.git.checkout.assert_called_with(commit_hash)
 
 
 @pytest.mark.asyncio