aniani/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-04 14:46:57 -05:00
Code

fix delete correct temp directory (#5839)

Browse Source
This commit is contained in:
yasuokav 2019-01-25 16:54:09 +09:00 committed by techknowlogick
parent 6b0c2e9e35
commit d663930023
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/pull.go
View File

@ -396,7 +396,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
return fmt.Errorf("Failed to create dir %s: %v", tmpBasePath, err) return fmt.Errorf("Failed to create dir %s: %v", tmpBasePath, err)
} }
defer os.RemoveAll(path.Dir(tmpBasePath)) defer os.RemoveAll(tmpBasePath)
var stderr string var stderr string
if _, stderr, err = process.GetManager().ExecTimeout(5*time.Minute, if _, stderr, err = process.GetManager().ExecTimeout(5*time.Minute,