diff options
| author | 6543 <6543@obermui.de> | 2022-03-29 21:13:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-30 03:13:41 +0800 |
| commit | 3e88af898a7b8e2697f7e4c3867c34b802d0b660 (patch) | |
| tree | e8304867b9fd8d78ef0a3da7221d84fb29592c21 /services/mirror | |
| parent | 889a8c268ca6a54ff5be19e61b29b10feb4a12e8 (diff) | |
| download | gitea-3e88af898a7b8e2697f7e4c3867c34b802d0b660.tar.gz gitea-3e88af898a7b8e2697f7e4c3867c34b802d0b660.zip | |
Make git.OpenRepository accept Context (#19260)
* OpenRepositoryCtx -> OpenRepository
* OpenRepository -> openRepositoryWithDefaultContext, only for internal usage
Diffstat (limited to 'services/mirror')
| -rw-r--r-- | services/mirror/mirror_pull.go | 4 | ||||
| -rw-r--r-- | services/mirror/mirror_push.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go index a8a646a51b..45749aebfd 100644 --- a/services/mirror/mirror_pull.go +++ b/services/mirror/mirror_pull.go @@ -281,7 +281,7 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo log.Error("SyncMirrors [repo: %-v]: %v", m.Repo, err) } - gitRepo, err := git.OpenRepositoryCtx(ctx, repoPath) + gitRepo, err := git.OpenRepository(ctx, repoPath) if err != nil { log.Error("SyncMirrors [repo: %-v]: failed to OpenRepository: %v", m.Repo, err) return nil, false @@ -438,7 +438,7 @@ func SyncPullMirror(ctx context.Context, repoID int64) bool { log.Trace("SyncMirrors [repo: %-v]: no branches updated", m.Repo) } else { log.Trace("SyncMirrors [repo: %-v]: %d branches updated", m.Repo, len(results)) - gitRepo, err = git.OpenRepositoryCtx(ctx, m.Repo.RepoPath()) + gitRepo, err = git.OpenRepository(ctx, m.Repo.RepoPath()) if err != nil { log.Error("SyncMirrors [repo: %-v]: unable to OpenRepository: %v", m.Repo, err) return false diff --git a/services/mirror/mirror_push.go b/services/mirror/mirror_push.go index b619f9ab32..742338ef5f 100644 --- a/services/mirror/mirror_push.go +++ b/services/mirror/mirror_push.go @@ -137,7 +137,7 @@ func runPushSync(ctx context.Context, m *repo_model.PushMirror) error { if setting.LFS.StartServer { log.Trace("SyncMirrors [repo: %-v]: syncing LFS objects...", m.Repo) - gitRepo, err := git.OpenRepositoryCtx(ctx, path) + gitRepo, err := git.OpenRepository(ctx, path) if err != nil { log.Error("OpenRepository: %v", err) return errors.New("Unexpected error") |