Skip to content

Commit ed58919

Browse files
lunnyzeripath
authored andcommitted
fix bug when migrating a private repository (#7917)
1 parent 3ac45e3 commit ed58919

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

modules/migrations/gitea.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"fmt"
1010
"io"
1111
"net/http"
12+
"net/url"
1213
"os"
1314
"path"
1415
"path/filepath"
@@ -79,12 +80,22 @@ func (g *GiteaLocalUploader) CreateRepo(repo *base.Repository, opts base.Migrate
7980
return err
8081
}
8182

83+
var remoteAddr = repo.CloneURL
84+
if len(opts.AuthUsername) > 0 {
85+
u, err := url.Parse(repo.CloneURL)
86+
if err != nil {
87+
return err
88+
}
89+
u.User = url.UserPassword(opts.AuthUsername, opts.AuthPassword)
90+
remoteAddr = u.String()
91+
}
92+
8293
r, err := models.MigrateRepository(g.doer, owner, models.MigrateRepoOptions{
8394
Name: g.repoName,
8495
Description: repo.Description,
8596
OriginalURL: repo.OriginalURL,
8697
IsMirror: repo.IsMirror,
87-
RemoteAddr: repo.CloneURL,
98+
RemoteAddr: remoteAddr,
8899
IsPrivate: repo.IsPrivate,
89100
Wiki: opts.Wiki,
90101
SyncReleasesWithTags: !opts.Releases, // if didn't get releases, then sync them from tags

0 commit comments

Comments
 (0)