From cb59a7ad40c86f3ce3ce8fd7b838e9e09634a361 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Wed, 2 Apr 2025 02:44:45 +0800 Subject: Git: Return fsPath from OpenRepo --- git_misc.go | 4 +--- http_server.go | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/git_misc.go b/git_misc.go index a8d7c30..3ff6f81 100644 --- a/git_misc.go +++ b/git_misc.go @@ -22,9 +22,7 @@ import ( // TODO: This should be deprecated in favor of doing it in the relevant // request/router context in the future, as it cannot cover the nuance of // fields needed. -func openRepo(ctx context.Context, groupPath []string, repoName string) (repo *git.Repository, description string, repoID int, err error) { - var fsPath string - +func openRepo(ctx context.Context, groupPath []string, repoName string) (repo *git.Repository, description string, repoID int, fsPath string, err error) { err = database.QueryRow(ctx, ` WITH RECURSIVE group_path_cte AS ( -- Start: match the first name in the path where parent_group IS NULL diff --git a/http_server.go b/http_server.go index 8931853..739c0aa 100644 --- a/http_server.go +++ b/http_server.go @@ -181,7 +181,7 @@ func (router *forgeHTTPRouter) ServeHTTP(writer http.ResponseWriter, request *ht // TODO: subgroups - if params["repo"], params["repo_description"], params["repo_id"], err = openRepo(request.Context(), groupPath, moduleName); err != nil { + if params["repo"], params["repo_description"], params["repo_id"], _, err = openRepo(request.Context(), groupPath, moduleName); err != nil { errorPage500(writer, params, "Error opening repo: "+err.Error()) return } -- cgit v1.2.3