Skip to content

fix(gitter): update origin/HEAD during fetch and skip reclone on 401 #6070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ly-Joey merged 1 commit into from
Sep 28, 2026
+3 −7
Merged

fix(gitter): update origin/HEAD during fetch and skip reclone on 401 #6070

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions go/cmd/gitter/git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,17 +116,11 @@ func attemptGitRecovery(ctx context.Context, repoPath string, err error) bool {

// fetchRepo fetches remote origin and updates origin/HEAD to the remote's default branch
func fetchRepo(ctx context.Context, repoPath string) error {
_, err := runCmd(ctx, repoPath, nil, "git", "fetch", "origin")
_, err := runCmd(ctx, repoPath, []string{"GIT_TERMINAL_PROMPT=0"}, "git", "-c", "remote.origin.followRemoteHead=always", "fetch", "origin")
if err != nil {
return fmt.Errorf("git fetch failed: %w", err)
}

// Make sure origin/HEAD points to the latest default branch from remotes
_, err = runCmd(ctx, repoPath, nil, "git", "remote", "set-head", "origin", "--auto")
if err != nil {
logger.WarnContext(ctx, "git remote set-head failed", slog.Any("err", err))
}

return nil
}

Expand Down Expand Up @@ -178,6 +172,8 @@ func refreshRepo(ctx context.Context, repoURL string, forceUpdate bool) error {
if err != nil {
var reason string
switch {
case isAuthError(err):
reason = "401 Unauthorized / auth error"
case isForbiddenError(err):
reason = "403 Forbidden"
case isRateLimitError(err):
Expand Down
Loading