fix delete correct temp directory (#5839)

tokarchuk/v1.17
yasuokav 6 years ago committed by techknowlogick
parent 6b0c2e9e35
commit d663930023
  1. 2
      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,

Loading…
Cancel
Save