tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-08-11 12:08:21 +00:00
Code Releases Activity

Fix delete correct temp directory (#5840)

Browse Source
This commit is contained in:
yasuokav
2019-01-25 16:33:15 +09:00
committed by techknowlogick
parent 8a9f5b3b50
commit 28d9305ea3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
models/pull.go
View File

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