Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix git open close bug (#12834)

Browse source
This commit is contained in:
Lunny Xiao 2020-09-15 02:42:40 +08:00 committed by GitHub
parent 6a1a6332de
commit 642c3c258b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/pull/pull.go
View file

@ -10,7 +10,7 @@ import (
"context"
"encoding/json"
"fmt"
"path"
"path/filepath"
"strings"
"time"
@ -421,6 +421,7 @@ func PushToBaseRepo(pr *models.PullRequest) (err error) {
if err != nil {
return fmt.Errorf("OpenRepository: %v", err)
}
defer gitRepo.Close()
if err := pr.LoadBaseRepo(); err != nil {
log.Error("Unable to load base repository for PR[%d] Error: %v", pr.ID, err)
@ -429,12 +430,11 @@ func PushToBaseRepo(pr *models.PullRequest) (err error) {
if err := gitRepo.AddRemote("base", pr.BaseRepo.RepoPath(), false); err != nil {
return fmt.Errorf("tmpGitRepo.AddRemote: %v", err)
}
defer gitRepo.Close()
headFile := pr.GetGitRefName()
// Remove head in case there is a conflict.
file := path.Join(pr.BaseRepo.RepoPath(), headFile)
file := filepath.Join(pr.BaseRepo.RepoPath(), headFile)
_ = util.Remove(file)