diff options
| author | yasuokav <yasuokav@gmail.com> | 2019-01-25 16:54:09 +0900 |
|---|---|---|
| committer | techknowlogick <matti@mdranta.net> | 2019-01-25 02:54:09 -0500 |
| commit | d66393002383cbaa2a4a73f7c5bb9dd24d05f4db (patch) | |
| tree | 5d30a057d95b95c49a7380aec4b3a601f7692271 | |
| parent | 6b0c2e9e35e716173ef89979c1590e40d431fe57 (diff) | |
| download | gitea-d66393002383cbaa2a4a73f7c5bb9dd24d05f4db.tar.gz gitea-d66393002383cbaa2a4a73f7c5bb9dd24d05f4db.zip | |
fix delete correct temp directory (#5839)
| -rw-r--r-- | models/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/models/pull.go b/models/pull.go index b2cf4b1f44..d84be139c9 100644 --- a/models/pull.go +++ b/models/pull.go @@ -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) } - defer os.RemoveAll(path.Dir(tmpBasePath)) + defer os.RemoveAll(tmpBasePath) var stderr string if _, stderr, err = process.GetManager().ExecTimeout(5*time.Minute, |