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/migrations | |
| 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/migrations')
| -rw-r--r-- | services/migrations/dump.go | 2 | ||||
| -rw-r--r-- | services/migrations/gitea_uploader.go | 2 | ||||
| -rw-r--r-- | services/migrations/gitea_uploader_test.go | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/services/migrations/dump.go b/services/migrations/dump.go index 594b78511a..9b0adc4a68 100644 --- a/services/migrations/dump.go +++ b/services/migrations/dump.go @@ -182,7 +182,7 @@ func (g *RepositoryDumper) CreateRepo(repo *base.Repository, opts base.MigrateOp } } - g.gitRepo, err = git.OpenRepositoryCtx(g.ctx, g.gitPath()) + g.gitRepo, err = git.OpenRepository(g.ctx, g.gitPath()) return err } diff --git a/services/migrations/gitea_uploader.go b/services/migrations/gitea_uploader.go index 607dd0a076..82e57e296d 100644 --- a/services/migrations/gitea_uploader.go +++ b/services/migrations/gitea_uploader.go @@ -136,7 +136,7 @@ func (g *GiteaLocalUploader) CreateRepo(repo *base.Repository, opts base.Migrate if err != nil { return err } - g.gitRepo, err = git.OpenRepositoryCtx(g.ctx, r.RepoPath()) + g.gitRepo, err = git.OpenRepository(g.ctx, r.RepoPath()) return err } diff --git a/services/migrations/gitea_uploader_test.go b/services/migrations/gitea_uploader_test.go index 34107b7f6a..1d4ec13d1c 100644 --- a/services/migrations/gitea_uploader_test.go +++ b/services/migrations/gitea_uploader_test.go @@ -247,7 +247,7 @@ func TestGiteaUploadUpdateGitForPullRequest(t *testing.T) { Author: &signature, Message: "Initial Commit", })) - fromGitRepo, err := git.OpenRepositoryCtx(git.DefaultContext, fromRepo.RepoPath()) + fromGitRepo, err := git.OpenRepository(git.DefaultContext, fromRepo.RepoPath()) assert.NoError(t, err) defer fromGitRepo.Close() baseSHA, err := fromGitRepo.GetBranchCommitID(baseRef) @@ -290,7 +290,7 @@ func TestGiteaUploadUpdateGitForPullRequest(t *testing.T) { Author: &signature, Message: "branch2 commit", })) - forkGitRepo, err := git.OpenRepositoryCtx(git.DefaultContext, forkRepo.RepoPath()) + forkGitRepo, err := git.OpenRepository(git.DefaultContext, forkRepo.RepoPath()) assert.NoError(t, err) defer forkGitRepo.Close() forkHeadSHA, err := forkGitRepo.GetBranchCommitID(forkHeadRef) |