From ed58919bfc7ba467492a28cd55446c6259f07baa Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 21 Aug 2019 04:21:07 +0800 Subject: [PATCH] fix bug when migrating a private repository (#7917) --- modules/migrations/gitea.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/migrations/gitea.go b/modules/migrations/gitea.go index ddfc2ca271..271c5616a7 100644 --- a/modules/migrations/gitea.go +++ b/modules/migrations/gitea.go @@ -9,6 +9,7 @@ import ( "fmt" "io" "net/http" + "net/url" "os" "path" "path/filepath" @@ -79,12 +80,22 @@ func (g *GiteaLocalUploader) CreateRepo(repo *base.Repository, opts base.Migrate return err } + var remoteAddr = repo.CloneURL + if len(opts.AuthUsername) > 0 { + u, err := url.Parse(repo.CloneURL) + if err != nil { + return err + } + u.User = url.UserPassword(opts.AuthUsername, opts.AuthPassword) + remoteAddr = u.String() + } + r, err := models.MigrateRepository(g.doer, owner, models.MigrateRepoOptions{ Name: g.repoName, Description: repo.Description, OriginalURL: repo.OriginalURL, IsMirror: repo.IsMirror, - RemoteAddr: repo.CloneURL, + RemoteAddr: remoteAddr, IsPrivate: repo.IsPrivate, Wiki: opts.Wiki, SyncReleasesWithTags: !opts.Releases, // if didn't get releases, then sync them from tags