ignore mode-only changes during update

Author: pmbstyle

src/octopal/cli/main.py

@@ -301,8 +301,26 @@ def _list_meaningful_worktree_changes(project_root: Path) -> list[str] | None:
         if stats.returncode != 0:
             return None
 
-        # `git diff --numstat` is empty for mode-only changes, so treat those as safe.
-        if stats.stdout.strip():
+        stats_lines = [line.strip() for line in stats.stdout.splitlines() if line.strip()]
+        if not stats_lines:
+            continue
+
+        is_meaningful = False
+        for line in stats_lines:
+            parts = line.split("\t")
+            if len(parts) < 3:
+                is_meaningful = True
+                break
+
+            added, deleted = parts[0].strip(), parts[1].strip()
+            if added == "0" and deleted == "0":
+                continue
+
+            # Binary/content changes often show `-` counters and should still block update.
+            is_meaningful = True
+            break
+
+        if is_meaningful:
             changes.append(path)
 
     return changes

tests/test_cli_update.py

@@ -62,10 +62,30 @@ def fake_run_capture(command: list[str], *, cwd, timeout=10.0):
         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="")
+            return subprocess.CompletedProcess(command, 0, stdout="0\t0\tscripts/bootstrap.sh\n", 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)
+
+
+def test_git_checkout_ready_blocks_real_content_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="3\t1\tscripts/bootstrap.sh\n", 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)
+
+    ok, reason = _git_checkout_ready_for_update(tmp_path)
+    assert ok is False
+    assert "scripts/bootstrap.sh" in str(reason)