Fix git.Init for doctor sub-command (#20782)

diff --git a/cmd/doctor.go b/cmd/doctor.go
index 1a15dd2941c57364ed0973987fb17fadf1e7b6c6..67a4ecc9c8eb493b74c9755b1f7c91a50ad23b9d 100644 (file)
--- a/cmd/doctor.go
+++ b/cmd/doctor.go
@@ -14,7 +14,6 @@ import (
        "code.gitea.io/gitea/models/db"
        "code.gitea.io/gitea/models/migrations"
        "code.gitea.io/gitea/modules/doctor"
-       "code.gitea.io/gitea/modules/git"
        "code.gitea.io/gitea/modules/log"
        "code.gitea.io/gitea/modules/setting"
 
@@ -128,11 +127,6 @@ func runDoctor(ctx *cli.Context) error {
        stdCtx, cancel := installSignals()
        defer cancel()
 
-       // some doctor sub-commands need to use git command
-       if err := git.InitFull(stdCtx); err != nil {
-               return err
-       }
-
        // Silence the default loggers
        log.DelNamedLogger("console")
        log.DelNamedLogger(log.DEFAULT)

diff --git a/modules/doctor/doctor.go b/modules/doctor/doctor.go
index c8975a788e128d375b025348ad91c0d910018632..5d14cef55c9f0e70b031d56cb3ea5c4f2db4b2a1 100644 (file)
--- a/modules/doctor/doctor.go
+++ b/modules/doctor/doctor.go
@@ -11,6 +11,7 @@ import (
        "strings"
 
        "code.gitea.io/gitea/models/db"
+       "code.gitea.io/gitea/modules/git"
        "code.gitea.io/gitea/modules/log"
        "code.gitea.io/gitea/modules/setting"
 )
@@ -49,7 +50,11 @@ func initDBDisableConsole(ctx context.Context, disableConsole bool) error {
 
        setting.NewXORMLogService(disableConsole)
        if err := db.InitEngine(ctx); err != nil {
-               return fmt.Errorf("models.SetEngine: %v", err)
+               return fmt.Errorf("db.InitEngine: %w", err)
+       }
+       // some doctor sub-commands need to use git command
+       if err := git.InitFull(ctx); err != nil {
+               return fmt.Errorf("git.InitFull: %w", err)
        }
        return nil
 }