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

fix: gt done handles missing origin tracking ref in worktrees (gt-cehl8)

Browse Source 
In worktrees, git push -u origin <branch> may not create the local
refs/remotes/origin/<branch> tracking ref due to missing refspecs.

BranchPushedToRemote now explicitly creates the remote tracking ref
from FETCH_HEAD after fetching if it does not exist locally.

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

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
gastown/polecats/furiosa
2025-12-31 13:11:17 -08:00
committed by Steve Yegge
parent aa2607eed2
commit d2a6ddb059
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/git/git.go
View File

@@ -745,7 +745,18 @@ func (g *Git) BranchPushedToRemote(localBranch, remote string) (bool, int, error
// Remote branch exists - fetch to ensure we have the local tracking ref
// This handles the case where we just pushed and origin/branch doesn't exist locally yet
_, _ = g.run("fetch", remote, localBranch)
_, fetchErr := g.run("fetch", remote, localBranch)
// In worktrees, the fetch may not update refs/remotes/origin/<branch> due to
// missing refspecs. If the remote ref doesn't exist locally, create it from FETCH_HEAD.
// See: gt-cehl8 (gt done fails in worktrees due to missing origin tracking ref)
remoteRef := "refs/remotes/" + remoteBranch
if _, err := g.run("rev-parse", "--verify", remoteRef); err != nil {
// Remote ref doesn't exist locally - update it from FETCH_HEAD if fetch succeeded
if fetchErr == nil {
_, _ = g.run("update-ref", remoteRef, "FETCH_HEAD")
}
}
// Check if local is ahead
count, err := g.run("rev-list", "--count", remoteBranch+"..HEAD")