From 8e5d4e8061a51fdec03e4d6619bff0bcfb95a585 Mon Sep 17 00:00:00 2001 From: Sam Catlow Date: Mon, 9 Nov 2026 09:38:39 +1100 Subject: [PATCH] fix(worktree): rebuild the repo mirror when a refresh fails on a corrupt mirror (#1831) --- internal/worktree/worktree.go | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/internal/worktree/worktree.go b/internal/worktree/worktree.go index 92ecaa898..8fd169794 100644 --- a/internal/worktree/worktree.go +++ b/internal/worktree/worktree.go @@ -206,17 +206,32 @@ func (m *Manager) ensureMirror(ctx context.Context, owner, repo string) (string, } return dir, nil } + if err := m.fetchMirror(ctx, dir); err != nil { + if ctx.Err() != nil { + return "", fmt.Errorf("refresh mirror %s/%s: %w", owner, repo, err) + } + // A fetch cut short (full disk) can leave a corrupt ref that fails every + // later fetch. The mirror is a cache and createMirror swaps it in only + // after a complete fetch, so rebuild it. + if cerr := m.createMirror(ctx, dir, url); cerr != nil { + return "", fmt.Errorf("refresh mirror %s/%s: %w; rebuild: %w", owner, repo, err, cerr) + } + } + return dir, nil +} + +func (m *Manager) fetchMirror(ctx context.Context, dir string) error { r, err := openRepo(dir) if err != nil { - return "", fmt.Errorf("open mirror %s/%s: %w", owner, repo, err) + return fmt.Errorf("open: %w", err) } // Force: the mirror copies the forge, so a moved tag or rewritten branch // replaces the local ref instead of failing every later fetch. if err := r.FetchContext(ctx, &git.FetchOptions{ClientOptions: m.auth(), Tags: plumbing.AllTags, Force: true}); err != nil && !errors.Is(err, git.NoErrAlreadyUpToDate) { - return "", fmt.Errorf("fetch mirror %s/%s: %w", owner, repo, err) + return fmt.Errorf("fetch: %w", err) } - return dir, nil + return nil } // createMirror builds a bare repository tracking every branch of url. It is