Skip to content

Commit 8b4d1d9

Browse files
committed
Add missing init
1 parent d016d12 commit 8b4d1d9

File tree

6 files changed

+21
-0
lines changed

6 files changed

+21
-0
lines changed

models/migrations/base/tests.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"code.gitea.io/gitea/models/unittest"
1717
"code.gitea.io/gitea/modules/base"
1818
"code.gitea.io/gitea/modules/git"
19+
"code.gitea.io/gitea/modules/gitrepo"
1920
"code.gitea.io/gitea/modules/log"
2021
"code.gitea.io/gitea/modules/setting"
2122
"code.gitea.io/gitea/modules/testlogger"
@@ -155,6 +156,10 @@ func MainTest(m *testing.M) {
155156
fmt.Printf("Unable to InitFull: %v\n", err)
156157
os.Exit(1)
157158
}
159+
if err = gitrepo.Init(context.Background()); err != nil {
160+
fmt.Printf("Unable to InitFull: %v\n", err)
161+
os.Exit(1)
162+
}
158163
setting.LoadDBSetting()
159164
setting.InitLoggersForTest()
160165

models/unittest/testdb.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"code.gitea.io/gitea/modules/base"
1818
"code.gitea.io/gitea/modules/cache"
1919
"code.gitea.io/gitea/modules/git"
20+
"code.gitea.io/gitea/modules/gitrepo"
2021
"code.gitea.io/gitea/modules/log"
2122
"code.gitea.io/gitea/modules/setting"
2223
"code.gitea.io/gitea/modules/setting/config"
@@ -174,6 +175,9 @@ func MainTest(m *testing.M, testOpts ...*TestOptions) {
174175
if err = git.InitFull(context.Background()); err != nil {
175176
fatalTestError("git.Init: %v\n", err)
176177
}
178+
if err = gitrepo.Init(context.Background()); err != nil {
179+
fatalTestError("gitrepo.Init: %v\n", err)
180+
}
177181
ownerDirs, err := os.ReadDir(setting.RepoRootPath)
178182
if err != nil {
179183
fatalTestError("unable to read the new repo root: %v\n", err)

routers/init.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"code.gitea.io/gitea/modules/cache"
1515
"code.gitea.io/gitea/modules/eventsource"
1616
"code.gitea.io/gitea/modules/git"
17+
"code.gitea.io/gitea/modules/gitrepo"
1718
"code.gitea.io/gitea/modules/highlight"
1819
"code.gitea.io/gitea/modules/log"
1920
"code.gitea.io/gitea/modules/markup"
@@ -113,6 +114,7 @@ func InitWebInstallPage(ctx context.Context) {
113114
// InitWebInstalled is for global installed configuration.
114115
func InitWebInstalled(ctx context.Context) {
115116
mustInitCtx(ctx, git.InitFull)
117+
mustInitCtx(ctx, gitrepo.Init)
116118
log.Info("Git version: %s (home: %s)", git.DefaultFeatures().VersionInfo(), git.HomeDir())
117119
if !git.DefaultFeatures().SupportHashSha256 {
118120
log.Warn("sha256 hash support is disabled - requires Git >= 2.42." + util.Iif(git.DefaultFeatures().UsingGogit, " Gogit is currently unsupported.", ""))

services/doctor/doctor.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212

1313
"code.gitea.io/gitea/models/db"
1414
"code.gitea.io/gitea/modules/git"
15+
"code.gitea.io/gitea/modules/gitrepo"
1516
"code.gitea.io/gitea/modules/log"
1617
"code.gitea.io/gitea/modules/setting"
1718
"code.gitea.io/gitea/modules/storage"
@@ -39,6 +40,9 @@ func initDBSkipLogger(ctx context.Context) error {
3940
if err := git.InitFull(ctx); err != nil {
4041
return fmt.Errorf("git.InitFull: %w", err)
4142
}
43+
if err := gitrepo.Init(ctx); err != nil {
44+
return fmt.Errorf("gitrepo.Init: %w", err)
45+
}
4246
return nil
4347
}
4448

tests/integration/migration-test/migration_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"code.gitea.io/gitea/modules/base"
2525
"code.gitea.io/gitea/modules/charset"
2626
"code.gitea.io/gitea/modules/git"
27+
"code.gitea.io/gitea/modules/gitrepo"
2728
"code.gitea.io/gitea/modules/log"
2829
"code.gitea.io/gitea/modules/setting"
2930
"code.gitea.io/gitea/modules/testlogger"
@@ -87,6 +88,7 @@ func initMigrationTest(t *testing.T) func() {
8788
}
8889

8990
assert.NoError(t, git.InitFull(context.Background()))
91+
assert.NoError(t, gitrepo.Init(context.Background()))
9092
setting.LoadDBSetting()
9193
setting.InitLoggersForTest()
9294
return deferFn

tests/test_utils.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"code.gitea.io/gitea/models/unittest"
1919
"code.gitea.io/gitea/modules/base"
2020
"code.gitea.io/gitea/modules/git"
21+
"code.gitea.io/gitea/modules/gitrepo"
2122
"code.gitea.io/gitea/modules/graceful"
2223
"code.gitea.io/gitea/modules/log"
2324
repo_module "code.gitea.io/gitea/modules/repository"
@@ -83,6 +84,9 @@ func InitTest(requireGitea bool) {
8384
if err := git.InitFull(context.Background()); err != nil {
8485
log.Fatal("git.InitOnceWithSync: %v", err)
8586
}
87+
if err := gitrepo.Init(context.Background()); err != nil {
88+
log.Fatal("gitrepo.Init: %v", err)
89+
}
8690

8791
setting.LoadDBSetting()
8892
if err := storage.Init(); err != nil {

0 commit comments

Comments
 (0)