Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Use fmt.Sprintf correctly (#17886)

Browse source
This commit is contained in:
delvh 2021-12-02 20:36:50 +01:00 committed by GitHub
parent fbf3208229
commit 4646c7c52d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/pr/checkout.go
View file

@ -215,7 +215,7 @@ func main() {
//Use git cli command for windows //Use git cli command for windows
runCmd("git", "fetch", remoteUpstream, fmt.Sprintf("pull/%s/head:%s", pr, branch)) runCmd("git", "fetch", remoteUpstream, fmt.Sprintf("pull/%s/head:%s", pr, branch))
} else { } else {
ref := fmt.Sprintf(gitea_git.PullPrefix+"%s/head:%s", pr, branchRef) ref := fmt.Sprintf("%s%s/head:%s", gitea_git.PullPrefix, pr, branchRef)
err = repo.Fetch(&git.FetchOptions{ err = repo.Fetch(&git.FetchOptions{
RemoteName: remoteUpstream, RemoteName: remoteUpstream,
RefSpecs: []config.RefSpec{ RefSpecs: []config.RefSpec{

2
models/pull.go
View file

@ -350,7 +350,7 @@ func (pr *PullRequest) GetDefaultSquashMessage() string {
// GetGitRefName returns git ref for hidden pull request branch // GetGitRefName returns git ref for hidden pull request branch
func (pr *PullRequest) GetGitRefName() string { func (pr *PullRequest) GetGitRefName() string {
return fmt.Sprintf(git.PullPrefix+"%d/head", pr.Index) return fmt.Sprintf("%s%d/head", git.PullPrefix, pr.Index)
} }
// IsChecking returns true if this pull request is still checking conflict. // IsChecking returns true if this pull request is still checking conflict.

2
modules/convert/pull.go
View file

@ -79,7 +79,7 @@ func ToAPIPullRequest(pr *models.PullRequest, doer *user_model.User) *api.PullRe
}, },
Head: &api.PRBranchInfo{ Head: &api.PRBranchInfo{
Name: pr.HeadBranch, Name: pr.HeadBranch,
Ref: fmt.Sprintf(git.PullPrefix+"%d/head", pr.Index), Ref: fmt.Sprintf("%s%d/head", git.PullPrefix, pr.Index),
RepoID: -1, RepoID: -1,
}, },
} }

2
modules/migration/pullrequest.go
View file

@ -45,7 +45,7 @@ func (p *PullRequest) IsForkPullRequest() bool {
// GetGitRefName returns pull request relative path to head // GetGitRefName returns pull request relative path to head
func (p PullRequest) GetGitRefName() string { func (p PullRequest) GetGitRefName() string {
return fmt.Sprintf(git.PullPrefix+"%d/head", p.Number) return fmt.Sprintf("%s%d/head", git.PullPrefix, p.Number)
} }
// PullRequestBranch represents a pull request branch // PullRequestBranch represents a pull request branch