Fix delete correct temp directory (#5840)

yasuokav · techknowlogick · commit 28d9305ea3b0 · 2019-01-25T02:33:15.000-05:00
diff --git a/models/pull.go b/models/pull.go
@@ -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,

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