Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle branch name with prefix in GitHub migration #20357

Merged
merged 14 commits into from
Nov 3, 2022
Merged

Handle branch name with prefix in GitHub migration #20357

Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
084c9c6
Handle branch name with prefix already
harryzcy Jul 13, 2022
a2c9b95
Merge remote-tracking branch 'upstream/main' into branch-with-prefix
harryzcy Jul 14, 2022
05134fb
Allow refname resolution in Releases page only
harryzcy Jul 14, 2022
98c466b
Update comment
harryzcy Jul 14, 2022
6e1ee49
Implement the same method for gogit
harryzcy Jul 14, 2022
c3351dc
Ensure reference has BranchPrefix
harryzcy Jul 22, 2022
4fd2ff5
Revert all changes
harryzcy Jul 23, 2022
e4aedf2
Revert errors
harryzcy Jul 23, 2022
ba30dbd
Convert github release commitish during migration
harryzcy Jul 23, 2022
c3d4c98
Merge branch 'main' into branch-with-prefix
harryzcy Aug 8, 2022
f72288b
Merge branch 'main' into branch-with-prefix
harryzcy Aug 22, 2022
511e3a0
Merge branch 'main' into branch-with-prefix
harryzcy Oct 30, 2022
8018359
Merge branch 'main' into branch-with-prefix
harryzcy Nov 2, 2022
719c5ae
Merge branch 'main' into branch-with-prefix
wxiaoguang Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion services/migrations/github.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"strings"
"time"

"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
base "code.gitea.io/gitea/modules/migration"
"code.gitea.io/gitea/modules/proxy"
Expand Down Expand Up @@ -307,10 +308,14 @@ func (g *GithubDownloaderV3) GetLabels() ([]*base.Label, error) {
}

func (g *GithubDownloaderV3) convertGithubRelease(rel *github.RepositoryRelease) *base.Release {
// GitHub allows commitish to be a reference.
// In this case, we need to remove the prefix, i.e. convert "refs/heads/main" to "main".
targetCommitish := strings.TrimPrefix(rel.GetTargetCommitish(), git.BranchPrefix)

r := &base.Release{
Name: rel.GetName(),
TagName: rel.GetTagName(),
TargetCommitish: rel.GetTargetCommitish(),
TargetCommitish: targetCommitish,
Draft: rel.GetDraft(),
Prerelease: rel.GetPrerelease(),
Created: rel.GetCreatedAt().Time,
Expand Down