cybercyst/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-05-05 15:32:53 +00:00
Code Issues Projects Releases Wiki Activity

Fix bug when visiting comparation page (#34334)

Browse Source 
The `ci.HeadGitRepo` was opened and closed in the function
`ParseCompareInfo` but reused in the function `PrepareCompareDiff`.
This commit is contained in:
Lunny Xiao 2025-05-04 11:52:00 -07:00 committed by GitHub
parent 180aa00abf
commit 41f3d062a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -402,12 +402,11 @@ func ParseCompareInfo(ctx *context.Context) *common.CompareInfo {
ci.HeadRepo = ctx.Repo.Repository ci.HeadRepo = ctx.Repo.Repository
ci.HeadGitRepo = ctx.Repo.GitRepo ci.HeadGitRepo = ctx.Repo.GitRepo
} else if has { } else if has {
ci.HeadGitRepo, err = gitrepo.OpenRepository(ctx, ci.HeadRepo) ci.HeadGitRepo, err = gitrepo.RepositoryFromRequestContextOrOpen(ctx, ci.HeadRepo)
if err != nil { if err != nil {
ctx.ServerError("OpenRepository", err) ctx.ServerError("RepositoryFromRequestContextOrOpen", err)
return nil return nil
} }
defer ci.HeadGitRepo.Close()
} else { } else {
ctx.NotFound(nil) ctx.NotFound(nil)
return nil return nil
@ -726,11 +725,6 @@ func getBranchesAndTagsForRepo(ctx gocontext.Context, repo *repo_model.Repositor
// CompareDiff show different from one commit to another commit // CompareDiff show different from one commit to another commit
func CompareDiff(ctx *context.Context) { func CompareDiff(ctx *context.Context) {
ci := ParseCompareInfo(ctx) ci := ParseCompareInfo(ctx)
defer func() {
if ci != nil && ci.HeadGitRepo != nil {
ci.HeadGitRepo.Close()
}
}()
if ctx.Written() { if ctx.Written() {
return return
} }

5
routers/web/repo/pull.go
View File

@ -1296,11 +1296,6 @@ func CompareAndPullRequestPost(ctx *context.Context) {
) )
ci := ParseCompareInfo(ctx) ci := ParseCompareInfo(ctx)
defer func() {
if ci != nil && ci.HeadGitRepo != nil {
ci.HeadGitRepo.Close()
}
}()
if ctx.Written() { if ctx.Written() {
return return
} }