Skip to content

fix(gitter): index.lock error fallback #4816

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 4 commits into from
Feb 16, 2026
Merged

fix(gitter): index.lock error fallback #4816

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f03f97
now this is a hotfix
Ly-Joey Feb 16, 2026
f1c9f64
accidentally included extra file
Ly-Joey Feb 16, 2026
548460e
add nil check in isIndexLockError
Ly-Joey Feb 16, 2026
d35c9c5
Fix lint and better if statement
Ly-Joey Feb 16, 2026
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
7 changes: 5 additions & 2 deletions go/cmd/gitter/gitter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,11 @@ func isAuthError(err error) bool {
}

func isIndexLockError(err error) bool {
if err == nil {
return false
}
errString := err.Error()

return strings.Contains(errString, "index.lock") && strings.Contains(errString, "File exists")
}

Expand Down Expand Up @@ -145,7 +149,7 @@ func fetchBlob(ctx context.Context, url string, forceUpdate bool) ([]byte, error
return nil, fmt.Errorf("git fetch failed: %w", err)
}
err = runCmd(ctx, repoPath, nil, "git", "reset", "--hard", "origin/HEAD")
if isIndexLockError(err) {
if err != nil && isIndexLockError(err) {
// index.lock exists, likely a previous git reset got terminated and wasn't cleaned up properly.
// We can remove the file and retry the command
logger.Warn("index.lock exists, attempting to remove and retry", slog.String("url", ctx.Value(urlKey).(string)))
Expand All @@ -156,7 +160,6 @@ func fetchBlob(ctx context.Context, url string, forceUpdate bool) ([]byte, error
// One more attempt at git reset
err = runCmd(ctx, repoPath, nil, "git", "reset", "--hard", "origin/HEAD")
}

if err != nil {
return nil, fmt.Errorf("git reset failed: %w", err)
}
Expand Down
Loading