diff options
author | Máximo Cuadros <mcuadros@gmail.com> | 2018-10-30 14:17:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-30 14:17:07 +0100 |
commit | 8b6ded6e7d6057a57619521c51127160b783169a (patch) | |
tree | d737ffe63ecd0059439517ee66a4168c0565807d /repository.go | |
parent | dfd6c820e3dc7477eaaf517d4ad3b34b62e6c42e (diff) | |
parent | 3332e8d67dbe810d1607285d43fcd79470cf9961 (diff) | |
download | go-git-8b6ded6e7d6057a57619521c51127160b783169a.tar.gz |
Merge pull request #1008 from smola/clone-cleanup
cleanup after failed clone
Diffstat (limited to 'repository.go')
-rw-r--r-- | repository.go | 72 |
1 files changed, 71 insertions, 1 deletions
diff --git a/repository.go b/repository.go index 507ff44..9420af9 100644 --- a/repository.go +++ b/repository.go @@ -5,6 +5,7 @@ import ( "context" "errors" "fmt" + "io" stdioutil "io/ioutil" "os" "path" @@ -342,12 +343,22 @@ func PlainClone(path string, isBare bool, o *CloneOptions) (*Repository, error) // // TODO(mcuadros): move isBare to CloneOptions in v5 func PlainCloneContext(ctx context.Context, path string, isBare bool, o *CloneOptions) (*Repository, error) { + dirExists, err := checkExistsAndIsEmptyDir(path) + if err != nil { + return nil, err + } + r, err := PlainInit(path, isBare) if err != nil { return nil, err } - return r, r.clone(ctx, o) + err = r.clone(ctx, o) + if err != nil && err != ErrRepositoryAlreadyExists { + cleanUpDir(path, !dirExists) + } + + return r, err } func newRepository(s storage.Storer, worktree billy.Filesystem) *Repository { @@ -358,6 +369,65 @@ func newRepository(s storage.Storer, worktree billy.Filesystem) *Repository { } } +func checkExistsAndIsEmptyDir(path string) (exists bool, err error) { + fi, err := os.Stat(path) + if err != nil { + if os.IsNotExist(err) { + return false, nil + } + + return false, err + } + + if !fi.IsDir() { + return false, fmt.Errorf("path is not a directory: %s", path) + } + + f, err := os.Open(path) + if err != nil { + return false, err + } + + defer ioutil.CheckClose(f, &err) + + _, err = f.Readdirnames(1) + if err == io.EOF { + return true, nil + } + + if err != nil { + return true, err + } + + return true, fmt.Errorf("directory is not empty: %s", path) +} + +func cleanUpDir(path string, all bool) error { + if all { + return os.RemoveAll(path) + } + + f, err := os.Open(path) + if err != nil { + return err + } + + defer ioutil.CheckClose(f, &err) + + names, err := f.Readdirnames(-1) + if err != nil { + return err + } + + for _, name := range names { + if err := os.RemoveAll(filepath.Join(path, name)); err != nil { + return err + } + } + + return nil +} + // Config return the repository config func (r *Repository) Config() (*config.Config, error) { return r.Storer.Config() |