summaryrefslogtreecommitdiffstats
path: root/routers/private/internal_repo.go
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2022-01-20 00:26:57 +0100
committerGitHub <noreply@github.com>2022-01-20 00:26:57 +0100
commit5cb0c9aa0d7eed087055b1efca79628957207d36 (patch)
treed117a514e1f17e5f6bfcda1be273f6a971112663 /routers/private/internal_repo.go
parentUpgrade Alpine from 3.13 to 3.15 (#18050) (diff)
downloadforgejo-5cb0c9aa0d7eed087055b1efca79628957207d36.tar.xz
forgejo-5cb0c9aa0d7eed087055b1efca79628957207d36.zip
Propagate context and ensure git commands run in request context (#17868)
This PR continues the work in #17125 by progressively ensuring that git commands run within the request context. This now means that the if there is a git repo already open in the context it will be used instead of reopening it. Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'routers/private/internal_repo.go')
-rw-r--r--routers/private/internal_repo.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/routers/private/internal_repo.go b/routers/private/internal_repo.go
index 8d0fd72235..ade862c613 100644
--- a/routers/private/internal_repo.go
+++ b/routers/private/internal_repo.go
@@ -43,7 +43,7 @@ func RepoAssignment(ctx *gitea_context.PrivateContext) context.CancelFunc {
return nil
}
- gitRepo, err := git.OpenRepository(repo.RepoPath())
+ gitRepo, err := git.OpenRepositoryCtx(ctx, repo.RepoPath())
if err != nil {
log.Error("Failed to open repository: %s/%s Error: %v", ownerName, repoName, err)
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{