mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-04 12:53:43 +01:00 
			
		
		
		
	Fix bug when visiting comparation page (#34334)
The `ci.HeadGitRepo` was opened and closed in the function `ParseCompareInfo` but reused in the function `PrepareCompareDiff`.
This commit is contained in:
		
							parent
							
								
									180aa00abf
								
							
						
					
					
						commit
						41f3d062a2
					
				@ -402,12 +402,11 @@ func ParseCompareInfo(ctx *context.Context) *common.CompareInfo {
 | 
			
		||||
		ci.HeadRepo = ctx.Repo.Repository
 | 
			
		||||
		ci.HeadGitRepo = ctx.Repo.GitRepo
 | 
			
		||||
	} else if has {
 | 
			
		||||
		ci.HeadGitRepo, err = gitrepo.OpenRepository(ctx, ci.HeadRepo)
 | 
			
		||||
		ci.HeadGitRepo, err = gitrepo.RepositoryFromRequestContextOrOpen(ctx, ci.HeadRepo)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			ctx.ServerError("OpenRepository", err)
 | 
			
		||||
			ctx.ServerError("RepositoryFromRequestContextOrOpen", err)
 | 
			
		||||
			return nil
 | 
			
		||||
		}
 | 
			
		||||
		defer ci.HeadGitRepo.Close()
 | 
			
		||||
	} else {
 | 
			
		||||
		ctx.NotFound(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
 | 
			
		||||
func CompareDiff(ctx *context.Context) {
 | 
			
		||||
	ci := ParseCompareInfo(ctx)
 | 
			
		||||
	defer func() {
 | 
			
		||||
		if ci != nil && ci.HeadGitRepo != nil {
 | 
			
		||||
			ci.HeadGitRepo.Close()
 | 
			
		||||
		}
 | 
			
		||||
	}()
 | 
			
		||||
	if ctx.Written() {
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
@ -1296,11 +1296,6 @@ func CompareAndPullRequestPost(ctx *context.Context) {
 | 
			
		||||
	)
 | 
			
		||||
 | 
			
		||||
	ci := ParseCompareInfo(ctx)
 | 
			
		||||
	defer func() {
 | 
			
		||||
		if ci != nil && ci.HeadGitRepo != nil {
 | 
			
		||||
			ci.HeadGitRepo.Close()
 | 
			
		||||
		}
 | 
			
		||||
	}()
 | 
			
		||||
	if ctx.Written() {
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user