mirror/superpowers
1
0
Fork 0
mirror of https://github.com/obra/superpowers.git synced 2026-09-03 04:05:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(requesting-code-review): anchor the multi-commit BASE_SHA alternative to the merge base

Browse Source 
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.
This commit is contained in:
Jesse Vincent
2026-08-13 00:26:43 +00:00
parent 777ceb5e12
commit 2a500febcc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skills/requesting-code-review/SKILL.md
+1 -1
View File
@@ -25,7 +25,7 @@ Dispatch a code reviewer subagent to catch issues before they cascade. The revie
**1. Get git SHAs:** **1. Get git SHAs:**
```bash ```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) HEAD_SHA=$(git rev-parse HEAD)
``` ```