fix delete correct temp directory (#5839)

6 years ago · d663930023
1 changed files with 1 additions and 1 deletions
--- 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,