diff options
| author | zeripath <art27@cantab.net> | 2021-06-07 00:44:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-06 19:44:58 -0400 |
| commit | 51775f65bc933843199320b040186703a2bb9f51 (patch) | |
| tree | 103463ed6f5ab76245c3dcbaa46773b3bf358e6b /modules/git/notes_gogit.go | |
| parent | b6762e23060972f0ad35aeab48850064687ea400 (diff) | |
| download | gitea-51775f65bc933843199320b040186703a2bb9f51.tar.gz gitea-51775f65bc933843199320b040186703a2bb9f51.zip | |
Make commit info cancelable (#16032)
* Make modules/context.Context a context.Context
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Simplify context calls
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Set the base context for requests to the HammerContext
Signed-off-by: Andrew Thornton <art27@cantab.net>
* pass context into get-last-commit
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Make commit_info cancellable
Signed-off-by: Andrew Thornton <art27@cantab.net>
* use context as context
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: 6543 <6543@obermui.de>
Diffstat (limited to 'modules/git/notes_gogit.go')
| -rw-r--r-- | modules/git/notes_gogit.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/git/notes_gogit.go b/modules/git/notes_gogit.go index 173d29cee6..534a5d5171 100644 --- a/modules/git/notes_gogit.go +++ b/modules/git/notes_gogit.go @@ -7,13 +7,14 @@ package git import ( + "context" "io/ioutil" "github.com/go-git/go-git/v5/plumbing/object" ) // GetNote retrieves the git-notes data for a given commit. -func GetNote(repo *Repository, commitID string, note *Note) error { +func GetNote(ctx context.Context, repo *Repository, commitID string, note *Note) error { notes, err := repo.GetCommit(NotesRef) if err != nil { return err @@ -62,7 +63,7 @@ func GetNote(repo *Repository, commitID string, note *Note) error { return err } - lastCommits, err := GetLastCommitForPaths(commitNode, "", []string{path}) + lastCommits, err := GetLastCommitForPaths(ctx, commitNode, "", []string{path}) if err != nil { return err } |