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,