NAMED exceptions

esphome/git.py

@@ -18,6 +18,22 @@ _LOGGER = logging.getLogger(__name__)
 NEVER_REFRESH = TimePeriodSeconds(seconds=-1)
 
 
+class GitException(cv.Invalid):
+    """Base exception for git-related errors."""
+
+
+class GitNotInstalledError(GitException):
+    """Exception raised when git is not installed on the system."""
+
+
+class GitCommandError(GitException):
+    """Exception raised when a git command fails."""
+
+
+class GitRepositoryError(GitException):
+    """Exception raised when a git repository is in an invalid state."""
+
+
 def run_git_command(
     cmd: list[str], cwd: str | None = None, git_dir: Path | None = None
 ) -> str:
@@ -33,8 +49,12 @@ def run_git_command(
     try:
         env = None
         if git_dir is not None:
-            # Force git to only operate on this specific repository
-            # This prevents git from walking up to parent repositories
+            # Force git to only operate on this specific repository by setting
+            # GIT_DIR and GIT_WORK_TREE. This prevents git from walking up the
+            # directory tree to find parent repositories when the target repo's
+            # .git directory is corrupt. Without this, commands like 'git stash'
+            # could accidentally operate on parent repositories (e.g., the main
+            # ESPHome repo) instead of failing, causing data loss.
             env = {
                 **subprocess.os.environ,
                 "GIT_DIR": str(Path(git_dir) / ".git"),
@@ -44,7 +64,7 @@ def run_git_command(
             cmd, cwd=cwd, capture_output=True, check=False, close_fds=False, env=env
         )
     except FileNotFoundError as err:
-        raise cv.Invalid(
+        raise GitNotInstalledError(
             "git is not installed but required for external_components.\n"
             "Please see https://git-scm.com/book/en/v2/Getting-Started-Installing-Git for installing git"
         ) from err
@@ -53,8 +73,8 @@ def run_git_command(
         err_str = ret.stderr.decode("utf-8")
         lines = [x.strip() for x in err_str.splitlines()]
         if lines[-1].startswith("fatal:"):
-            raise cv.Invalid(lines[-1][len("fatal: ") :])
-        raise cv.Invalid(err_str)
+            raise GitCommandError(lines[-1][len("fatal: ") :])
+        raise GitCommandError(err_str)
 
     return ret.stdout.decode("utf-8").strip()
 
@@ -152,7 +172,7 @@ def clone_or_update(
                     str(repo_dir),
                     git_dir=repo_dir,
                 )
-            except cv.Invalid as err:
+            except GitException as err:
                 # Repository is in a broken state or update failed
                 # Only attempt recovery once to prevent infinite recursion
                 if not _recover_broken:

tests/unit_tests/test_git.py

@@ -9,8 +9,8 @@ from unittest.mock import Mock
 import pytest
 
 from esphome import git
-import esphome.config_validation as cv
 from esphome.core import CORE, TimePeriodSeconds
+from esphome.git import GitCommandError
 
 
 def _compute_repo_dir(url: str, ref: str | None, domain: str) -> Path:
@@ -305,7 +305,7 @@ def test_clone_or_update_recovers_from_git_failures(
 
         # Fail on first call to the specified command, succeed on subsequent calls
         if cmd_type == fail_command and call_counts[cmd_type] == 1:
-            raise cv.Invalid(error_message)
+            raise GitCommandError(error_message)
 
         # Default successful responses
         if cmd_type == "rev-parse":
@@ -357,12 +357,12 @@ def test_clone_or_update_fails_when_recovery_also_fails(
         cmd_type = _get_git_command_type(cmd)
         if cmd_type == "rev-parse":
             # First time fails (broken repo)
-            raise cv.Invalid(
+            raise GitCommandError(
                 "ambiguous argument 'HEAD': unknown revision or path not in the working tree."
             )
         if cmd_type == "clone":
             # Clone also fails (recovery fails)
-            raise cv.Invalid("fatal: unable to access repository")
+            raise GitCommandError("fatal: unable to access repository")
         return ""
 
     mock_run_git_command.side_effect = git_command_side_effect
@@ -370,7 +370,7 @@ def test_clone_or_update_fails_when_recovery_also_fails(
     refresh = TimePeriodSeconds(days=1)
 
     # Should raise after one recovery attempt fails
-    with pytest.raises(cv.Invalid, match="fatal: unable to access repository"):
+    with pytest.raises(GitCommandError, match="fatal: unable to access repository"):
         git.clone_or_update(
             url=url,
             ref=ref,
@@ -417,7 +417,7 @@ def test_clone_or_update_recover_broken_flag_prevents_second_recovery(
 
         # First attempt: rev-parse fails (broken repo)
         if cmd_type == "rev-parse" and call_counts[cmd_type] == 1:
-            raise cv.Invalid(
+            raise GitCommandError(
                 "ambiguous argument 'HEAD': unknown revision or path not in the working tree."
             )
 
@@ -428,7 +428,7 @@ def test_clone_or_update_recover_broken_flag_prevents_second_recovery(
         # Recovery: fetch for ref checkout fails
         # This happens in the clone path when ref is not None (line 80 in git.py)
         if cmd_type == "fetch" and call_counts[cmd_type] == 1:
-            raise cv.Invalid("fatal: couldn't find remote ref main")
+            raise GitCommandError("fatal: couldn't find remote ref main")
 
         # Default success
         return "abc123" if cmd_type == "rev-parse" else ""
@@ -439,7 +439,7 @@ def test_clone_or_update_recover_broken_flag_prevents_second_recovery(
 
     # Should raise on the fetch during recovery (when _recover_broken=False)
     # This tests the critical "if not _recover_broken: raise" path
-    with pytest.raises(cv.Invalid, match="fatal: couldn't find remote ref main"):
+    with pytest.raises(GitCommandError, match="fatal: couldn't find remote ref main"):
         git.clone_or_update(
             url=url,
             ref=ref,
@@ -498,7 +498,7 @@ def test_clone_or_update_recover_broken_flag_prevents_infinite_loop(
             return "abc123"
         if cmd_type == "stash":
             # Always fails
-            raise cv.Invalid("fatal: unable to write new index file")
+            raise GitCommandError("fatal: unable to write new index file")
         return ""
 
     mock_run_git_command.side_effect = git_command_side_effect
@@ -510,7 +510,7 @@ def test_clone_or_update_recover_broken_flag_prevents_infinite_loop(
     # This hits the "if not _recover_broken: raise" path
     with (
         unittest.mock.patch("esphome.git.shutil.rmtree", side_effect=mock_rmtree),
-        pytest.raises(cv.Invalid, match="fatal: unable to write new index file"),
+        pytest.raises(GitCommandError, match="fatal: unable to write new index file"),
     ):
         git.clone_or_update(
             url=url,