johno/gastown
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(nuke): Check content on main, not just commit SHAs

Browse Source 
After squash merge, polecat branches have different commit SHAs than main
even though the content is identical. This was causing false "unpushed
commits" warnings during nuke safety checks.

Now uses `git diff` to verify if content differs from main, rather than
just counting commits ahead. If diff is empty, content is on main
(via squash merge) and nuke is safe. (gt-fo9iz)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
furiosa
2026-01-02 17:11:11 -08:00
committed by Steve Yegge
parent 2ad83421c5
commit 8feb27d44c
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
internal/cmd/polecat.go
View File

@@ -1041,12 +1041,16 @@ func getGitState(worktreePath string) (*GitState, error) {
}
// Check for unpushed commits (git log origin/main..HEAD)
logCmd := exec.Command("git", "log", "origin/main..HEAD", "--oneline")
// We check commits first, then verify if content differs.
// After squash merge, commits may differ but content may be identical.
mainRef := "origin/main"
logCmd := exec.Command("git", "log", mainRef+"..HEAD", "--oneline")
logCmd.Dir = worktreePath
output, err = logCmd.Output()
if err != nil {
// origin/main might not exist - try origin/master
logCmd = exec.Command("git", "log", "origin/master..HEAD", "--oneline")
mainRef = "origin/master"
logCmd = exec.Command("git", "log", mainRef+"..HEAD", "--oneline")
logCmd.Dir = worktreePath
output, _ = logCmd.Output() // non-fatal: might be a new repo without remote tracking
}
@@ -1058,9 +1062,22 @@ func getGitState(worktreePath string) (*GitState, error) {
count++
}
}
state.UnpushedCommits = count
if count > 0 {
state.Clean = false
// Commits exist that aren't on main. But after squash merge,
// the content may actually be on main with different commit SHAs.
// Check if there's any actual diff between HEAD and main.
diffCmd := exec.Command("git", "diff", mainRef, "HEAD", "--quiet")
diffCmd.Dir = worktreePath
diffErr := diffCmd.Run()
if diffErr == nil {
// Exit code 0 means no diff - content IS on main (squash merged)
// Don't count these as unpushed
state.UnpushedCommits = 0
} else {
// Exit code 1 means there's a diff - truly unpushed work
state.UnpushedCommits = count
state.Clean = false
}
}
}