fix tests

Author: NicolasIRAGNE

src/gitingest/utils/git_utils.py

@@ -11,6 +11,7 @@
 from urllib.parse import urlparse, urlunparse
 
 import git
+from gitdb.util import os
 
 from gitingest.utils.compat_func import removesuffix
 from gitingest.utils.exceptions import InvalidGitHubTokenError
@@ -120,7 +121,7 @@ async def ensure_git_installed() -> None:
 
 
 async def check_repo_exists(url: str, token: str | None = None) -> bool:
-    """Check whether a remote Git repository is reachable using git ls-remote.
+    """Check whether a remote Git repository is reachable.
 
     Parameters
     ----------
@@ -136,25 +137,12 @@ async def check_repo_exists(url: str, token: str | None = None) -> bool:
 
     """
     try:
-        await ensure_git_installed()
-
-        git_cmd = git.Git()
-
-        # Add token to URL if provided and it's a GitHub repository
-        auth_url = url
-        if token and is_github_host(url):
-            auth_url = _add_token_to_url(url, token)
-
-        # Use git ls-remote to check if repository exists
-        # This will return refs if repo exists, or fail if it doesn't
-        git_cmd.ls_remote(auth_url, "--exit-code")
-
-    except git.GitCommandError:
-        # Repository doesn't exist, is private without proper auth, or other git error
-        return False
-    except Exception:
-        # Git not installed or other system error
+        # Try to resolve HEAD - if repo exists, this will work
+        await _resolve_ref_to_sha(url, "HEAD", token=token)
+    except (ValueError, Exception):
+        # Repository doesn't exist, is private without proper auth, or other error
         return False
+
     return True
 
 
@@ -448,7 +436,7 @@ async def _resolve_ref_to_sha(url: str, pattern: str, token: str | None = None)
             raise ValueError(msg)
 
     except git.GitCommandError as exc:
-        msg = f"Failed to resolve {pattern} in {url}: {exc}"
+        msg = f"Failed to resolve {pattern} in {url}:{os.linesep}{exc}"
         raise ValueError(msg) from exc
 
     return sha

src/server/query_processor.py

@@ -308,7 +308,7 @@ async def process_query(
         _print_error(query.url, exc, max_file_size, pattern_type, pattern)
         # Clean up repository even if processing failed
         _cleanup_repository(clone_config)
-        return IngestErrorResponse(error=str(exc))
+        return IngestErrorResponse(error=f"{exc!s}")
 
     if len(content) > MAX_DISPLAY_SIZE:
         content = (

tests/test_clone.py

@@ -9,7 +9,6 @@
 import sys
 from typing import TYPE_CHECKING
 
-import git
 import pytest
 
 from gitingest.clone import clone_repo
@@ -104,19 +103,18 @@ async def test_check_repo_exists(
     expected: bool,
     mocker: MockerFixture,
 ) -> None:
-    """Verify that ``check_repo_exists`` interprets git ls-remote results correctly."""
-    mock_git = mocker.patch("git.Git")
-    mock_git_instance = mock_git.return_value
+    """Verify that ``check_repo_exists`` works by using _resolve_ref_to_sha."""
+    mock_resolve = mocker.patch("gitingest.utils.git_utils._resolve_ref_to_sha")
 
     if git_command_succeeds:
-        mock_git_instance.ls_remote.return_value = "abc123\trefs/heads/main\n"
+        mock_resolve.return_value = "abc123def456"  # Mock SHA
     else:
-        mock_git_instance.ls_remote.side_effect = git.GitCommandError("ls-remote", 128)
+        mock_resolve.side_effect = ValueError("Repository not found")
 
     result = await check_repo_exists(DEMO_URL)
 
     assert result is expected
-    mock_git_instance.ls_remote.assert_called_once_with(DEMO_URL, "--exit-code")
+    mock_resolve.assert_called_once_with(DEMO_URL, "HEAD", token=None)
 
 
 @pytest.mark.asyncio
@@ -213,22 +211,13 @@ async def test_check_repo_exists_with_auth_token(mocker: MockerFixture) -> None:
 
     Given a GitHub URL and a token:
     When ``check_repo_exists`` is called,
-    Then it should add the token to the URL and call git ls-remote.
+    Then it should pass the token to _resolve_ref_to_sha.
     """
-    mock_git = mocker.patch("git.Git")
-    mock_git_instance = mock_git.return_value
-    mock_git_instance.ls_remote.return_value = "abc123\trefs/heads/main\n"
-
-    # Mock the _add_token_to_url function
-    mock_add_token = mocker.patch("gitingest.utils.git_utils._add_token_to_url")
-    mock_add_token.return_value = "https://x-oauth-basic:token123@github.com/test/repo"
+    mock_resolve = mocker.patch("gitingest.utils.git_utils._resolve_ref_to_sha")
+    mock_resolve.return_value = "abc123def456"  # Mock SHA
 
     test_token = "token123"  # noqa: S105
     result = await check_repo_exists("https://github.com/test/repo", token=test_token)
 
     assert result is True
-    mock_add_token.assert_called_once_with("https://github.com/test/repo", "token123")
-    mock_git_instance.ls_remote.assert_called_once_with(
-        "https://x-oauth-basic:token123@github.com/test/repo",
-        "--exit-code",
-    )
+    mock_resolve.assert_called_once_with("https://github.com/test/repo", "HEAD", token=test_token)