From 51775f65bc933843199320b040186703a2bb9f51 Mon Sep 17 00:00:00 2001 From: zeripath Date: Mon, 7 Jun 2021 00:44:58 +0100 Subject: Make commit info cancelable (#16032) * Make modules/context.Context a context.Context Signed-off-by: Andrew Thornton * Simplify context calls Signed-off-by: Andrew Thornton * Set the base context for requests to the HammerContext Signed-off-by: Andrew Thornton * pass context into get-last-commit Signed-off-by: Andrew Thornton * Make commit_info cancellable Signed-off-by: Andrew Thornton * use context as context Signed-off-by: Andrew Thornton Co-authored-by: 6543 <6543@obermui.de> --- modules/git/notes_nogogit.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'modules/git/notes_nogogit.go') diff --git a/modules/git/notes_nogogit.go b/modules/git/notes_nogogit.go index d5d194b23f..2b92724995 100644 --- a/modules/git/notes_nogogit.go +++ b/modules/git/notes_nogogit.go @@ -7,12 +7,13 @@ package git import ( + "context" "io/ioutil" "strings" ) // 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 @@ -63,7 +64,7 @@ func GetNote(repo *Repository, commitID string, note *Note) error { path = path[idx+1:] } - lastCommits, err := GetLastCommitForPaths(notes, treePath, []string{path}) + lastCommits, err := GetLastCommitForPaths(ctx, notes, treePath, []string{path}) if err != nil { return err } -- cgit v1.2.3