[bompus]

This replaces #537, whose review bot reached its six-review limit. The commit here is #537's final head, one commit on main; the design changed during #537's review, so the bot has not seen it from the start.

The landing helper's fast-forward could silently replace an ignored local file (for example a .env) when the incoming commit adds a tracked file at the same path, because its clean-tree check does not look at ignored files.

• Fast-forward: verify-landed.sh --ff and the direct git merge --ff-only commands in the core landing rule and the landing and squash-landing references now pass --no-overwrite-ignore. The checkout is skipped with fast-forward refused and exit 3, and the file is untouched.
• Local squash: --no-overwrite-ignore does not protect git merge --squash of a diverged branch (reproduced on Git 2.56.0: the three-way merge replaces the ignored file and exits 0). The squash reference now uses skills/hr-pr-followup/scripts/squash-land.sh <branch> "<message>". It builds the squash in a throwaway worktree of HEAD, which holds none of the checkout's ignored files, with a normal git merge --squash and git commit (so the repository's commit hooks run; a rejecting hook exits 1 and changes nothing), and applies the commit with git merge --ff-only --no-overwrite-ignore. Git refuses that at the moment it writes when it would replace an ignored or untracked local file, so there is no scan to get wrong and no gap to race. Exit 1: refused, nothing changed; exit 2: usage error, no commit in HEAD, or a conflict.

Verified by hand in scratch repositories: the ff-only form refuses an ignored file at the same path, an ignored file or symlink where a directory is needed, and a tracked directory turned into a file with an ignored file inside.

Proof: bun run check passes; the node tests pass, and the skill tests also pass with no global Git config. squash-land.test.js uses real diverged branches: the squash itself, an ignored file, an untracked file, a file or symlink where a directory is needed, a directory turned into a file with ignored files inside, a subdirectory, a conflict, a branch that adds nothing, a rejecting hook, a message-rewriting hook and a checkout with no commit. An earlier version scanned for collisions first; the review found a series of ways it could miss one, so it was replaced by letting Git refuse the write. An independent DeepSeek review found no way to replace the contents of an ignored, untracked or modified local file. It did find, and this head fixes, three things: a merge.ff setting turned every run into a false "conflict"; hooks in an ignored core.hooksPath directory were skipped in the throwaway worktree; and a failed worktree checkout exited outside the documented codes. It also showed that the final step is not atomic (a held ref lock or an unwritable directory can leave files updated while the branch does not move), so the script and the reference no longer claim "nothing changed" for that step and tell the caller to check git status.

[bompus-ai-review]

Bompus AI Review (GPT-6.1 Terra, max reasoning): 10 finding(s).

[bompus-ai-review]

Bompus AI Review (GPT-6.1 Terra, max reasoning): 6 finding(s).

[bompus-ai-review]

Bompus AI Review (GPT-6.1 Terra, max reasoning): 1 finding(s).

Review 3: only high findings and above are posted from here on.

[bompus-ai-review]

Bompus AI Review (GPT-6.1 Terra, max reasoning): 1 finding(s).

Review 4: only high findings and above are posted from here on.

[bompus-ai-review]

Bompus AI Review (GPT-6.1 Terra, max reasoning): 1 finding(s).

Review 5: only high findings and above are posted from here on.

[bompus-ai-review]

Bompus AI Review (GPT-6.1 Terra, max reasoning): 1 finding(s).

Review 6: only high findings and above are posted from here on.

[bompus-ai-review]

Bompus AI Review limit: this pull request has had 6 reviews, so no more will be posted. Findings above that are still open stay open. A maintainer can still review by hand.

[bompus]

Closed under the owner's 2026-11-03 rule (Question 153, option 153b): the fourth independent Sol read of this helper found one more data-loss case (an awk failure on PATH still counted as 'no gitlink'; every git failure was already fail-closed). The branch fix/landing-keep-ignored-files-v2 at e946f70 is kept, with a 14-line fix described in the review, and the old landing text stays. Reopening needs the owner's say. Reads: 1 four findings (one high), 2 four (one high), 3 one data-loss plus two fail-safe, 4 (this) one data-loss.