kevin
/
hugo-micropub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix

master
Jan-Lukas Else 2020-03-20 15:32:36 +01:00
parent 82d9057b10
commit f4bac41d11
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
storage.go
View File

@ -48,7 +48,7 @@ func (g Git) init() (r *git.Repository, w *git.Worktree, err error) {
} }
if err != nil { if err != nil {
// Delete old things // Delete old things
_ = os.RemoveAll(g.filepath) g.destroyRepo()
// Clone // Clone
r, err = git.PlainClone(g.filepath, false, &git.CloneOptions{ r, err = git.PlainClone(g.filepath, false, &git.CloneOptions{
Auth: &gitHttp.BasicAuth{ Auth: &gitHttp.BasicAuth{
@ -72,6 +72,10 @@ func (g Git) init() (r *git.Repository, w *git.Worktree, err error) {
return return
} }
func (g Git) destroyRepo() {
_ = os.RemoveAll(g.filepath)
}
func (g Git) push(repository *git.Repository) error { func (g Git) push(repository *git.Repository) error {
err := repository.Push(&git.PushOptions{ err := repository.Push(&git.PushOptions{
Auth: &gitHttp.BasicAuth{ Auth: &gitHttp.BasicAuth{
@ -82,6 +86,8 @@ func (g Git) push(repository *git.Repository) error {
if err == nil || err == git.NoErrAlreadyUpToDate { if err == nil || err == git.NoErrAlreadyUpToDate {
return nil return nil
} else { } else {
// Destroy repo to prevent errors when trying to create same post again
g.destroyRepo()
return errors.New("failed to push to remote") return errors.New("failed to push to remote")
} }
} }