From 2a500febcc10a07f24df8b72452156a16f277600 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Thu, 13 Aug 2026 00:26:43 +0000 Subject: [PATCH] fix(requesting-code-review): anchor the multi-commit BASE_SHA alternative to the merge base The '# or origin/main' alternative fed a moving ref into the reviewer's two-dot diff: once origin/main advances past the branch point, main's new files appear as phantom deletions the reviewer can't distinguish from real ones. Reproduced during triage (2026-08-12): a scratch repo with main advanced one commit shows 'main-new.txt | 1 -' in the branch's diff. git merge-base origin/main HEAD anchors the range to the branch point, matching how sdd's review-package already computes BASE. Reported in #2118 (wan-huiyan). Fixes #2118. --- skills/requesting-code-review/SKILL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skills/requesting-code-review/SKILL.md b/skills/requesting-code-review/SKILL.md index fa4f2f99..6d995da5 100644 --- a/skills/requesting-code-review/SKILL.md +++ b/skills/requesting-code-review/SKILL.md @@ -25,7 +25,7 @@ Dispatch a code reviewer subagent to catch issues before they cascade. The revie **1. Get git SHAs:** ```bash -BASE_SHA=$(git rev-parse HEAD~1) # or origin/main +BASE_SHA=$(git rev-parse HEAD~1) # or: git merge-base origin/main HEAD HEAD_SHA=$(git rev-parse HEAD) ```