mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-09-07 07:03:21 +00:00
fix delete correct temp directory (#5839)
This commit is contained in:
parent
6b0c2e9e35
commit
d663930023
1 changed files with 1 additions and 1 deletions
|
@ -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,
|
||||||
|
|
Loading…
Reference in a new issue