diff --git a/pkg/dump.go b/pkg/dump.go index db9820a..af004cd 100644 --- a/pkg/dump.go +++ b/pkg/dump.go @@ -2,6 +2,7 @@ package pkg import ( "bufio" + "git-get/pkg/cfg" "os" "strings" @@ -58,6 +59,7 @@ func parseLine(line string) (parsedLine, error) { } parsed.rawurl = parts[0] + parsed.branch = cfg.DefBranch if len(parts) == 2 { parsed.branch = parts[1] } diff --git a/pkg/repo/repo.go b/pkg/repo/repo.go index 328e662..887a9a7 100644 --- a/pkg/repo/repo.go +++ b/pkg/repo/repo.go @@ -73,6 +73,11 @@ func Clone(opts *CloneOpts) (*Repo, error) { repo, err := git.PlainClone(opts.Path, false, gitOpts) if err != nil { + + if opts.IgnoreExisting && errors.Is(err, git.ErrRepositoryAlreadyExists) { + return nil, nil + } + return nil, errors.Wrap(err, "Failed cloning repo") }