Skip to content

Commit 1ac03bb

Browse files
committed
Fix lint
1 parent 9b5e3c5 commit 1ac03bb

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

routers/web/repo/issue_dev.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
repo_model "code.gitea.io/gitea/models/repo"
1313
unit_model "code.gitea.io/gitea/models/unit"
1414
"code.gitea.io/gitea/modules/git"
15-
"code.gitea.io/gitea/modules/gitrepo"
1615
"code.gitea.io/gitea/modules/web"
1716
"code.gitea.io/gitea/routers/utils"
1817
"code.gitea.io/gitea/services/context"
@@ -39,7 +38,6 @@ func CreateBranchFromIssue(ctx *context.Context) {
3938

4039
form := web.GetForm(ctx).(*forms.NewBranchForm)
4140
repo := ctx.Repo.Repository
42-
gitRepo := ctx.Repo.GitRepo
4341
// if create branch in a forked repository
4442
if form.RepoID > 0 && form.RepoID != repo.ID {
4543
var err error
@@ -48,12 +46,6 @@ func CreateBranchFromIssue(ctx *context.Context) {
4846
ctx.ServerError("GetRepositoryByID", err)
4947
return
5048
}
51-
gitRepo, err = gitrepo.OpenRepository(ctx, repo)
52-
if err != nil {
53-
ctx.ServerError("OpenRepository", err)
54-
return
55-
}
56-
defer gitRepo.Close()
5749
}
5850

5951
perm, err := access_model.GetUserRepoPermission(ctx, repo, ctx.Doer)
@@ -68,7 +60,7 @@ func CreateBranchFromIssue(ctx *context.Context) {
6860
return
6961
}
7062

71-
if err := repo_service.CreateNewBranch(ctx, ctx.Doer, repo, gitRepo, form.SourceBranchName, form.NewBranchName); err != nil {
63+
if err := repo_service.CreateNewBranch(ctx, ctx.Doer, repo, form.SourceBranchName, form.NewBranchName); err != nil {
7264
switch {
7365
case git_model.IsErrBranchAlreadyExists(err) || git.IsErrPushOutOfDate(err):
7466
ctx.JSONError(ctx.Tr("repo.branch.branch_already_exists", form.NewBranchName))

tests/integration/pull_merge_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ func TestCantMergeUnrelated(t *testing.T) {
409409
assert.NoError(t, err)
410410
defer gitRepo1.Close()
411411

412-
assert.NoError(t, repo_service.CreateNewBranchFromCommit(t.Context(), user1, repo1, gitRepo1, commitSha, "unrelated"))
412+
assert.NoError(t, repo_service.CreateNewBranchFromCommit(t.Context(), user1, repo1, commitSha, "unrelated"))
413413

414414
testEditFileToNewBranch(t, session, "user1", "repo1", "master", "conflict", "README.md", "Hello, World (Edited Once)\n")
415415

0 commit comments

Comments
 (0)