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>

1 files changed, 10 insertions, 0 deletions

diff --git a/modules/web/route.go b/modules/web/route.go
index 1d9c92bd7a..19193773d5 100644
--- a/modules/web/route.go
+++ b/modules/web/route.go
@@ -30,6 +30,7 @@ func Wrap(handlers ...interface{}) http.HandlerFunc {
 			func(ctx *context.Context),
 			func(ctx *context.Context) goctx.CancelFunc,
 			func(*context.APIContext),
+			func(*context.APIContext) goctx.CancelFunc,
 			func(*context.PrivateContext),
 			func(*context.PrivateContext) goctx.CancelFunc,
 			func(http.Handler) http.Handler:
@@ -60,6 +61,15 @@ func Wrap(handlers ...interface{}) http.HandlerFunc {
 				if ctx.Written() {
 					return
 				}
+			case func(*context.APIContext) goctx.CancelFunc:
+				ctx := context.GetAPIContext(req)
+				cancel := t(ctx)
+				if cancel != nil {
+					defer cancel()
+				}
+				if ctx.Written() {
+					return
+				}
 			case func(*context.PrivateContext) goctx.CancelFunc:
 				ctx := context.GetPrivateContext(req)
 				cancel := t(ctx)