From 7dc0ed91c697e2aee6b31c0b57f26dc32f234b40 Mon Sep 17 00:00:00 2001 From: Norwin Date: Wed, 16 Mar 2022 23:14:18 +0100 Subject: [PATCH 1/2] tea clone: set upstream remote for mirrors fixes #457 --- modules/task/repo_clone.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/modules/task/repo_clone.go b/modules/task/repo_clone.go index bc164fc..1f83b78 100644 --- a/modules/task/repo_clone.go +++ b/modules/task/repo_clone.go @@ -57,16 +57,24 @@ func RepoClone( return nil, err } - // set up upstream remote for forks + // set up upstream remote for forks and mirrors + var upstreamURL string + var upstreamBranch string if repoMeta.Fork && repoMeta.Parent != nil { - upstreamURL, err := cloneURL(repoMeta.Parent, login) - if err != nil { + if upstreamURLRaw, err := cloneURL(repoMeta.Parent, login); err != nil { return nil, err + } else { + upstreamURL = upstreamURLRaw.String() } - upstreamBranch := repoMeta.Parent.DefaultBranch + upstreamBranch = repoMeta.Parent.DefaultBranch + } else if repoMeta.Mirror && len(repoMeta.OriginalURL) != 0 { + upstreamURL = repoMeta.OriginalURL + upstreamBranch = repoMeta.DefaultBranch + } + if len(upstreamURL) != 0 { repo.CreateRemote(&git_config.RemoteConfig{ Name: "upstream", - URLs: []string{upstreamURL.String()}, + URLs: []string{upstreamURL}, }) repoConf, err := repo.Config() if err != nil { -- 2.40.1 From e1633c387f2918292768b86494b3556d8adb5e5a Mon Sep 17 00:00:00 2001 From: Norwin Date: Wed, 16 Mar 2022 23:48:30 +0100 Subject: [PATCH 2/2] lint --- modules/task/repo_clone.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/task/repo_clone.go b/modules/task/repo_clone.go index 1f83b78..8bb488a 100644 --- a/modules/task/repo_clone.go +++ b/modules/task/repo_clone.go @@ -61,11 +61,11 @@ func RepoClone( var upstreamURL string var upstreamBranch string if repoMeta.Fork && repoMeta.Parent != nil { - if upstreamURLRaw, err := cloneURL(repoMeta.Parent, login); err != nil { + upstreamURLRaw, err := cloneURL(repoMeta.Parent, login) + if err != nil { return nil, err - } else { - upstreamURL = upstreamURLRaw.String() } + upstreamURL = upstreamURLRaw.String() upstreamBranch = repoMeta.Parent.DefaultBranch } else if repoMeta.Mirror && len(repoMeta.OriginalURL) != 0 { upstreamURL = repoMeta.OriginalURL -- 2.40.1