!squash git version

Author: tony

src/libvcs/cmd/git.py

@@ -20,9 +20,7 @@ class InvalidBuildOptions(ValueError):
     """Raised when a git version output is in an unexpected format.
 
     >>> InvalidBuildOptions("...")
-    Traceback (most recent call last):
-        ...
-    libvcs.cmd.git.InvalidBuildOptions: Unexpected git version output format: ...
+    InvalidBuildOptions('Unexpected git version output format: ...')
     """
 
     def __init__(self, version: str, *args: object) -> None:
@@ -1787,18 +1785,12 @@ def config(
     def version(
         self,
         *,
-        build_options: bool | None = None,
         # libvcs special behavior
         check_returncode: bool | None = None,
         **kwargs: t.Any,
     ) -> Version:
         """Get git version. Wraps `git version <https://git-scm.com/docs/git-version>`_.
 
-        Parameters
-        ----------
-        build_options : bool, optional
-            Include build options in the output with ``--build-options``
-
         Returns
         -------
         Version
@@ -1816,16 +1808,9 @@ def version(
         >>> version = git.version()
         >>> isinstance(version.major, int)
         True
-
-        >>> version = git.version(build_options=True)
-        >>> isinstance(version.major, int)
-        True
         """
         local_flags: list[str] = []
 
-        if build_options is True:
-            local_flags.append("--build-options")
-
         output = self.run(
             ["version", *local_flags],
             check_returncode=check_returncode,
@@ -1837,7 +1822,7 @@ def version(
             return parse_version(version_str)
 
         # Raise exception if output format is unexpected
-        raise InvalidVersion(f"Unexpected git version output format: {output}")
+        raise InvalidVersion(output)
 
     def build_options(
         self,
@@ -1880,7 +1865,7 @@ def build_options(
         # First line is always "git version X.Y.Z"
         lines = output.strip().split("\n")
         if not lines or not lines[0].startswith("git version "):
-            raise InvalidBuildOptions(f"Unexpected git version output format: {output}")
+            raise InvalidBuildOptions(output)
 
         version_str = lines[0].replace("git version ", "").strip()
         result.version = version_str
@@ -1916,8 +1901,10 @@ def build_options(
                     result.sizeof_size_t = value
                 elif key == "shell-path":
                     result.shell_path = value
-            # Special handling for the commit line which often has no colon
-            elif "commit" in line and "no commit" not in line.lower():
+                elif key == "commit":
+                    result.commit = value
+            # Special handling for the "no commit" line which has no colon
+            elif "no commit associated with this build" in line.lower():
                 result.commit = line
 
         return result

src/libvcs/sync/git.py

@@ -658,13 +658,8 @@ def get_git_version(self) -> str:
         -------
         git version
         """
-        VERSION_PFX = "git version "
         version = self.cmd.version()
-        if version.startswith(VERSION_PFX):
-            version = version[len(VERSION_PFX) :].split()[0]
-        else:
-            version = ""
-        return ".".join(version.split(".")[:3])
+        return ".".join([str(x) for x in (version.major, version.minor, version.micro)])
 
     def status(self) -> GitStatus:
         """Retrieve status of project in dict format.

tests/cmd/test_git.py

@@ -7,7 +7,7 @@
 
 import pytest
 
-from libvcs._vendor.version import Version
+from libvcs._vendor.version import InvalidVersion, Version
 from libvcs.cmd import git
 
 
@@ -36,35 +36,6 @@ def test_version_basic(monkeypatch: pytest.MonkeyPatch, tmp_path: pathlib.Path)
     assert str(result) == "2.43.0"
 
 
-def test_version_with_build_options(
-    monkeypatch: pytest.MonkeyPatch,
-    tmp_path: pathlib.Path,
-) -> None:
-    """Test git version with build options."""
-    git_cmd = git.Git(path=tmp_path)
-
-    sample_output = """git version 2.43.0
-cpu: x86_64
-no commit associated with this build
-sizeof-long: 8
-sizeof-size_t: 8
-shell-path: /bin/sh"""
-
-    def mock_run(cmd_args: list[str], **kwargs: t.Any) -> str:
-        assert cmd_args == ["version", "--build-options"]
-        assert kwargs.get("check_returncode") is None
-        return sample_output
-
-    monkeypatch.setattr(git_cmd, "run", mock_run)
-
-    result = git_cmd.version(build_options=True)
-    assert isinstance(result, Version)
-    assert result.major == 2
-    assert result.minor == 43
-    assert result.micro == 0
-    assert str(result) == "2.43.0"
-
-
 def test_build_options(monkeypatch: pytest.MonkeyPatch, tmp_path: pathlib.Path) -> None:
     """Test build_options() method."""
     git_cmd = git.Git(path=tmp_path)
@@ -132,10 +103,10 @@ def test_version_invalid_format(
 
     monkeypatch.setattr(git_cmd, "run", lambda *args, **kwargs: invalid_output)
 
-    with pytest.raises(git.InvalidVersion) as excinfo:
+    with pytest.raises(InvalidVersion) as excinfo:
         git_cmd.version()
 
-    assert "Unexpected git version output format" in str(excinfo.value)
+    assert f"Invalid version: '{invalid_output}'" in str(excinfo.value)
 
 
 def test_build_options_invalid_format(