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

merged 3 commits into from
Jul 13, 2022

Commits on Jul 12, 2022

  1. Prevent context deadline error propagation in GetCommitsInfo 

    Although `WalkGitLog` tries to test for `context.DeadlineExceededErr`
there is a small chance that the error will propagate to the reader
before it is recognised. This will cause the error to propagate up to
`renderDirectoryFiles` and cause a http status 500.

Here we check that the error passed is a `DeadlineExceededErr` or if it
could be unwrapped to one.

Fix go-gitea#20329

Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    ac5b997 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2022

  1. Update modules/git/log_name_status.go

    @zeripath
    zeripath authored Jul 13, 2022
    Configuration menu
    Copy the full SHA
    e900d1a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into fix-20329-context-deadline-exceeded-err

    @zeripath
    zeripath authored Jul 13, 2022
    Configuration menu
    Copy the full SHA
    232394b View commit details
    Browse the repository at this point in the history