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) (#34364)

Browse Source 
Backport #34334 by @lunny

The `ci.HeadGitRepo` was opened and closed in the function
`ParseCompareInfo` but reused in the function `PrepareCompareDiff`.

---------

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
Giteabot 2025-05-05 03:56:47 +08:00 committed by GitHub
parent 046fc8684c
commit 8e5aa8fb1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -405,7 +405,6 @@ func ParseCompareInfo(ctx *context.Context) *common.CompareInfo {
ctx.ServerError("OpenRepository", err) ctx.ServerError("OpenRepository", err)
return nil return nil
} }
defer ci.HeadGitRepo.Close()
} else { } else {
ctx.NotFound("ParseCompareInfo", nil) ctx.NotFound("ParseCompareInfo", nil)
return nil return nil
@ -708,7 +707,7 @@ func getBranchesAndTagsForRepo(ctx gocontext.Context, repo *repo_model.Repositor
func CompareDiff(ctx *context.Context) { func CompareDiff(ctx *context.Context) {
ci := ParseCompareInfo(ctx) ci := ParseCompareInfo(ctx)
defer func() { defer func() {
if ci != nil && ci.HeadGitRepo != nil { if !ctx.Repo.PullRequest.SameRepo && ci != nil && ci.HeadGitRepo != nil {
ci.HeadGitRepo.Close() ci.HeadGitRepo.Close()
} }
}() }()

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

@ -1263,7 +1263,7 @@ func CompareAndPullRequestPost(ctx *context.Context) {
ci := ParseCompareInfo(ctx) ci := ParseCompareInfo(ctx)
defer func() { defer func() {
if ci != nil && ci.HeadGitRepo != nil { if !ctx.Repo.PullRequest.SameRepo && ci != nil && ci.HeadGitRepo != nil {
ci.HeadGitRepo.Close() ci.HeadGitRepo.Close()
} }
}() }()