Fix delete correct temp directory (#5840)

go-gitea · Jan 25, 2019 · 28d9305 · 28d9305
1 parent 8a9f5b3
commit 28d9305
Showing 1 changed file with 1 addition and 1 deletion.
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,