allow update when only file mode changed

Author: pmbstyle

src/octopal/cli/main.py

@@ -286,6 +286,28 @@ def _run_capture(command: list[str], *, cwd: Path, timeout: float = 10.0) -> sub
     )
 
 
+def _list_meaningful_worktree_changes(project_root: Path) -> list[str] | None:
+    diff = _run_capture(["git", "diff", "--name-only"], cwd=project_root)
+    if diff.returncode != 0:
+        return None
+
+    changes: list[str] = []
+    for raw_path in diff.stdout.splitlines():
+        path = raw_path.strip()
+        if not path:
+            continue
+
+        stats = _run_capture(["git", "diff", "--numstat", "--", path], cwd=project_root)
+        if stats.returncode != 0:
+            return None
+
+        # `git diff --numstat` is empty for mode-only changes, so treat those as safe.
+        if stats.stdout.strip():
+            changes.append(path)
+
+    return changes
+
+
 def _git_checkout_ready_for_update(project_root: Path) -> tuple[bool, str | None]:
     if not (project_root / ".git").exists():
         return False, "This install is not a git checkout."
@@ -299,7 +321,14 @@ def _git_checkout_ready_for_update(project_root: Path) -> tuple[bool, str | None
         return False, f"Could not inspect git status: {detail}"
 
     if status.stdout.strip():
-        return False, "Working tree has local changes. Commit or stash them first."
+        meaningful_changes = _list_meaningful_worktree_changes(project_root)
+        if meaningful_changes is None:
+            return False, "Could not determine whether local changes are content changes or mode-only changes."
+        if meaningful_changes:
+            names = ", ".join(meaningful_changes[:3])
+            if len(meaningful_changes) > 3:
+                names += ", ..."
+            return False, f"Working tree has local content changes: {names}. Commit or stash them first."
 
     return True, None
 

tests/test_cli_update.py

@@ -1,8 +1,10 @@
 from __future__ import annotations
 
+import subprocess
+
 from typer.testing import CliRunner
 
-from octopal.cli.main import app
+from octopal.cli.main import _git_checkout_ready_for_update, app
 
 runner = CliRunner()
 
@@ -49,3 +51,21 @@ def test_update_warns_when_runtime_is_active(monkeypatch, tmp_path) -> None:
     assert result.exit_code == 0
     assert "Octopal is running right now." in result.stdout
     assert "uv run octopal restart" in result.stdout
+
+
+def test_git_checkout_ready_allows_mode_only_changes(monkeypatch, tmp_path) -> None:
+    (tmp_path / ".git").mkdir()
+
+    def fake_run_capture(command: list[str], *, cwd, timeout=10.0):
+        if command == ["git", "status", "--porcelain"]:
+            return subprocess.CompletedProcess(command, 0, stdout=" M scripts/bootstrap.sh\n", stderr="")
+        if command == ["git", "diff", "--name-only"]:
+            return subprocess.CompletedProcess(command, 0, stdout="scripts/bootstrap.sh\n", stderr="")
+        if command == ["git", "diff", "--numstat", "--", "scripts/bootstrap.sh"]:
+            return subprocess.CompletedProcess(command, 0, stdout="", stderr="")
+        raise AssertionError(f"unexpected command: {command}")
+
+    monkeypatch.setattr("octopal.cli.main.shutil.which", lambda _name: "/usr/bin/git")
+    monkeypatch.setattr("octopal.cli.main._run_capture", fake_run_capture)
+
+    assert _git_checkout_ready_for_update(tmp_path) == (True, None)