Skip to content
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

Jump to bottom

Prevent context deadline error propagation in GetCommitsInfo #20346

Merged
merged 3 commits into from
Jul 13, 2022
Merged

Prevent context deadline error propagation in GetCommitsInfo #20346

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac5b997
Prevent context deadline error propagation in GetCommitsInfo
zeripath Jul 12, 2022
e900d1a
Update modules/git/log_name_status.go
zeripath Jul 13, 2022
232394b
Merge branch 'main' into fix-20329-context-deadline-exceeded-err
zeripath Jul 13, 2022
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
8 changes: 5 additions & 3 deletions modules/git/log_name_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"bufio"
"bytes"
"context"
"errors"
"io"
"path"
"sort"
Expand Down Expand Up @@ -62,9 +63,10 @@ func LogNameStatusRepo(ctx context.Context, repository, head, treepath string, p
})
if err != nil {
_ = stdoutWriter.CloseWithError(ConcatenateError(err, (&stderr).String()))
} else {
_ = stdoutWriter.Close()
return
}

_ = stdoutWriter.Close()
}()

// For simplicities sake we'll us a buffered reader to read from the cat-file --batch
Expand Down Expand Up @@ -354,7 +356,7 @@ heaploop:
}
current, err := g.Next(treepath, path2idx, changed, maxpathlen)
if err != nil {
if err == context.DeadlineExceeded {
if errors.Is(err, context.DeadlineExceeded) {
break heaploop
}
g.Close()
Expand Down