Skip to content

Commit bcd253a

Browse files
authored
Add migration http transport for push/sync mirror lfs (#36665)
1 parent 5ad8761 commit bcd253a

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

services/mirror/mirror_pull.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"code.gitea.io/gitea/modules/setting"
2626
"code.gitea.io/gitea/modules/timeutil"
2727
"code.gitea.io/gitea/modules/util"
28+
"code.gitea.io/gitea/services/migrations"
2829
notify_service "code.gitea.io/gitea/services/notify"
2930
repo_service "code.gitea.io/gitea/services/repository"
3031
)
@@ -172,7 +173,7 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*repo_module.SyncResu
172173
if m.LFS && setting.LFS.StartServer {
173174
log.Trace("SyncMirrors [repo: %-v]: syncing LFS objects...", m.Repo)
174175
endpoint := lfs.DetermineEndpoint(remoteURL.String(), m.LFSEndpoint)
175-
lfsClient := lfs.NewClient(endpoint, nil)
176+
lfsClient := lfs.NewClient(endpoint, migrations.NewMigrationHTTPTransport())
176177
if err = repo_module.StoreMissingLfsObjectsInRepository(ctx, m.Repo, gitRepo, lfsClient); err != nil {
177178
log.Error("SyncMirrors [repo: %-v]: failed to synchronize LFS objects for repository: %v", m.Repo.FullName(), err)
178179
}

services/mirror/mirror_push.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"code.gitea.io/gitea/modules/setting"
2424
"code.gitea.io/gitea/modules/timeutil"
2525
"code.gitea.io/gitea/modules/util"
26+
"code.gitea.io/gitea/services/migrations"
2627
repo_service "code.gitea.io/gitea/services/repository"
2728
)
2829

@@ -144,7 +145,7 @@ func runPushSync(ctx context.Context, m *repo_model.PushMirror) error {
144145
defer gitRepo.Close()
145146

146147
endpoint := lfs.DetermineEndpoint(remoteURL.String(), "")
147-
lfsClient := lfs.NewClient(endpoint, nil)
148+
lfsClient := lfs.NewClient(endpoint, migrations.NewMigrationHTTPTransport())
148149
if err := pushAllLFSObjects(ctx, gitRepo, lfsClient); err != nil {
149150
return util.SanitizeErrorCredentialURLs(err)
150151
}

0 commit comments

Comments
 (0)