mirror of
https://github.com/gogs/gogs.git
synced 2026-01-31 11:39:19 +01:00
style: format code with Go fmt and Gofumpt
This commit fixes the style issues introduced in 748ecbf according to the output
from Go fmt and Gofumpt.
Details: https://github.com/gogs/gogs/pull/8105
This commit is contained in:
committed by
GitHub
parent
748ecbfdf3
commit
d2ff1fa978
@@ -200,7 +200,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
|
||||
return errors.Newf("Issue.changeStatus: %v", err)
|
||||
}
|
||||
|
||||
headRepoPath := RepoPath(pr.HeadUserName, pr.HeadRepo.Name)
|
||||
headRepoPath := RepoPath(pr.HeadUserName, pr.HeadRepo.Name)
|
||||
headGitRepo, err := git.Open(headRepoPath)
|
||||
if err != nil {
|
||||
return errors.Newf("open repository: %v", err)
|
||||
@@ -450,13 +450,13 @@ func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []str
|
||||
pr.BaseRepo = repo
|
||||
if err := pr.testPatch(); err != nil {
|
||||
return errors.Newf("testPatch: %v", err)
|
||||
}
|
||||
// No conflict appears after test means mergeable.
|
||||
if pr.Status == PullRequestStatusChecking {
|
||||
pr.Status = PullRequestStatusMergeable
|
||||
}
|
||||
}
|
||||
// No conflict appears after test means mergeable.
|
||||
if pr.Status == PullRequestStatusChecking {
|
||||
pr.Status = PullRequestStatusMergeable
|
||||
}
|
||||
|
||||
pr.IssueID = pull.ID
|
||||
pr.IssueID = pull.ID
|
||||
if err := tx.Create(pr).Error; err != nil {
|
||||
return errors.Newf("insert pull repo: %v", err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user