Codebase intelligence for AI and humans: code health scores, auto-generated docs, git analytics, dead code detection, and architectural decisions via MCP.
Python aicode-complexitycode-healthcode-intelligencecode-qualitydead-codedeveloper-toolsdocumentationgit-analyticsmcpopen-sourcepythonrefactoringstatic-analysistechnical-debt
fix(hooks): resolve the real hooks dir so worktree installs don't crash init (#1808)
Sloeca6fcd14db75
diff --git a/packages/cli/src/repowise/cli/hooks.py b/packages/cli/src/repowise/cli/hooks.pyindex 9de084ab4..d7b3abd16 100644--- a/packages/cli/src/repowise/cli/hooks.py+++ b/packages/cli/src/repowise/cli/hooks.py@@ -12,6 +12,7 @@ from __future__ import annotationsimport contextlibimport reimport stat+import subprocessfrom pathlib import Path_HOOK_MARKER = "# repowise-hook-start"@@ -96,6 +97,36 @@ def _git_root(path: Path) -> Path | None:return None+def _hooks_dir(repo_path: Path) -> Path | None:+ """Resolve the real hooks directory for *repo_path*.++ A normal repo keeps ``.git/hooks`` under ``.git``, but a git **worktree**+ stores ``.git`` as a *file* (``gitdir: <path>``) pointing at the shared+ metadata dir — so ``root / ".git" / "hooks"`` is ``NotADirectoryError``+ territory. Ask git for the real hooks path so both layouts work, and fall+ back to the ``.git/hooks`` heuristic when git is unavailable or not a repo.+ """+ try:+ result = subprocess.run(+ ["git", "rev-parse", "--git-path", "hooks"],+ cwd=str(repo_path),+ capture_output=True,+ text=True,+ timeout=10,+ )+ if result.returncode == 0:+ p = Path(result.stdout.strip())+ if p.is_absolute():+ return p+ return repo_path / p+ except Exception:+ pass+ root = _git_root(repo_path)+ if root is None:+ return None+ return root / ".git" / "hooks"++def _strip_legacy_block(content: str) -> tuple[str, bool]:"""Remove a pre-marker repowise hook body from *content*.@@ -186,8 +217,10 @@ def install(repo_path: Path) -> str:if root is None:return "not a git repository"- hooks_dir = root / ".git" / "hooks"- hooks_dir.mkdir(exist_ok=True)+ hooks_dir = _hooks_dir(repo_path)+ if hooks_dir is None:+ return "not a git repository"+ hooks_dir.mkdir(parents=True, exist_ok=True)hook_path = hooks_dir / "post-commit"migrated_legacy = False@@ -239,7 +272,10 @@ def uninstall(repo_path: Path) -> str:if root is None:return "not a git repository"- hook_path = root / ".git" / "hooks" / "post-commit"+ hooks_dir = _hooks_dir(repo_path)+ if hooks_dir is None:+ return "not a git repository"+ hook_path = hooks_dir / "post-commit"if not hook_path.exists():return "no post-commit hook found"@@ -268,7 +304,10 @@ def status(repo_path: Path) -> str:if root is None:return "not a git repository"- hook_path = root / ".git" / "hooks" / "post-commit"+ hooks_dir = _hooks_dir(repo_path)+ if hooks_dir is None:+ return "not a git repository"+ hook_path = hooks_dir / "post-commit"if not hook_path.exists():return "not installed"diff --git a/tests/unit/cli/test_hooks_legacy_migration.py b/tests/unit/cli/test_hooks_legacy_migration.pyindex 58eb6c427..26aec9ec0 100644--- a/tests/unit/cli/test_hooks_legacy_migration.py+++ b/tests/unit/cli/test_hooks_legacy_migration.py@@ -185,6 +185,38 @@ class TestInstallUpgradesMarkerBlock:assert result == "already installed"+ class TestInstallInWorktree:+ """Issue #1609: a git worktree stores ``.git`` as a *file*, not a+ directory, so the naive ``root / \".git\" / \"hooks\"`` path crashed+ ``install``/``status`` with ``NotADirectoryError`` and took down ``init``.+ ``_hooks_dir`` resolves the real hooks path via git instead."""++ @pytest.fixture+ def worktree(self, tmp_path):+ main = tmp_path / "main"+ main.mkdir()+ subprocess.run(["git", "init", "-q"], cwd=main, check=True)+ (main / "f.txt").write_text("hi\n", encoding="utf-8")+ subprocess.run(["git", "add", "."], cwd=main, check=True)+ subprocess.run(+ ["git", "-c", "user.email=t@t", "-c", "user.name=t", "commit", "-qm", "init"],+ cwd=main,+ check=True,+ )+ wt = tmp_path / "wt"+ subprocess.run(["git", "worktree", "add", "-q", str(wt)], cwd=main, check=True)+ assert (wt / ".git").is_file(), "expected .git to be a file in a worktree"+ return wt++ def test_install_does_not_crash_in_worktree(self, worktree):+ result = install(worktree)+ assert result == "installed"+ assert status(worktree) == "installed"++ def test_status_in_worktree_is_not_an_error(self, worktree):+ assert status(worktree) == "not installed"++class TestInstalledHookScript:"""Sanity checks on the shipped hook script so platform-specificregressions (e.g. accidentally introducing bash-only syntax) get caught