Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-11-06 01:36:09 +01:00
Code Issues Activity

Fix lint

Browse Source
This commit is contained in:
Lunny Xiao 2025-10-28 11:58:08 -07:00
parent 9b5e3c52c1
commit 1ac03bb35e
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
routers/web/repo/issue_dev.go
View File

@ -12,7 +12,6 @@ import (
repo_model "code.gitea.io/gitea/models/repo" repo_model "code.gitea.io/gitea/models/repo"
unit_model "code.gitea.io/gitea/models/unit" unit_model "code.gitea.io/gitea/models/unit"
"code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/gitrepo"
"code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/modules/web"
"code.gitea.io/gitea/routers/utils" "code.gitea.io/gitea/routers/utils"
"code.gitea.io/gitea/services/context" "code.gitea.io/gitea/services/context"
@ -39,7 +38,6 @@ func CreateBranchFromIssue(ctx *context.Context) {
form := web.GetForm(ctx).(*forms.NewBranchForm) form := web.GetForm(ctx).(*forms.NewBranchForm)
repo := ctx.Repo.Repository repo := ctx.Repo.Repository
gitRepo := ctx.Repo.GitRepo
// if create branch in a forked repository // if create branch in a forked repository
if form.RepoID > 0 && form.RepoID != repo.ID { if form.RepoID > 0 && form.RepoID != repo.ID {
var err error var err error
@ -48,12 +46,6 @@ func CreateBranchFromIssue(ctx *context.Context) {
ctx.ServerError("GetRepositoryByID", err) ctx.ServerError("GetRepositoryByID", err)
return return
} }
gitRepo, err = gitrepo.OpenRepository(ctx, repo)
if err != nil {
ctx.ServerError("OpenRepository", err)
return
}
defer gitRepo.Close()
} }
perm, err := access_model.GetUserRepoPermission(ctx, repo, ctx.Doer) perm, err := access_model.GetUserRepoPermission(ctx, repo, ctx.Doer)
@ -68,7 +60,7 @@ func CreateBranchFromIssue(ctx *context.Context) {
return return
} }
if err := repo_service.CreateNewBranch(ctx, ctx.Doer, repo, gitRepo, form.SourceBranchName, form.NewBranchName); err != nil { if err := repo_service.CreateNewBranch(ctx, ctx.Doer, repo, form.SourceBranchName, form.NewBranchName); err != nil {
switch { switch {
case git_model.IsErrBranchAlreadyExists(err) || git.IsErrPushOutOfDate(err): case git_model.IsErrBranchAlreadyExists(err) || git.IsErrPushOutOfDate(err):
ctx.JSONError(ctx.Tr("repo.branch.branch_already_exists", form.NewBranchName)) ctx.JSONError(ctx.Tr("repo.branch.branch_already_exists", form.NewBranchName))

2
tests/integration/pull_merge_test.go
View File

@ -409,7 +409,7 @@ func TestCantMergeUnrelated(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
defer gitRepo1.Close() defer gitRepo1.Close()
assert.NoError(t, repo_service.CreateNewBranchFromCommit(t.Context(), user1, repo1, gitRepo1, commitSha, "unrelated")) assert.NoError(t, repo_service.CreateNewBranchFromCommit(t.Context(), user1, repo1, commitSha, "unrelated"))
testEditFileToNewBranch(t, session, "user1", "repo1", "master", "conflict", "README.md", "Hello, World (Edited Once)\n") testEditFileToNewBranch(t, session, "user1", "repo1", "master", "conflict", "README.md", "Hello, World (Edited Once)\n")