toolshed/abra
toolshed/abra
4
2
Fork 18
Code Issues 29 Pull Requests 3 Packages Releases 40 Activity

fix: make branches available as recipe source #453

Closed
stevensting wants to merge 3 commits from branch-recipes into main
pull from: branch-recipes
merge into: toolshed:main
Conversation 7 Commits 3 Files Changed 3 +10 -20
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 776a8414d4 - Show all commits

30
pkg/git/clone.go
View File

@ -8,7 +8,6 @@ import (
"coopcloud.tech/abra/pkg/log"
"github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing"
)
// Clone runs a git clone which accounts for different default branches.
@ -17,28 +16,19 @@ func Clone(dir, url string) error {
log.Debugf("%s does not exist, attempting to git clone from %s", dir, url)
_, err := git.PlainClone(dir, false, &git.CloneOptions{
URL: url,
Tags: git.AllTags,
ReferenceName: plumbing.ReferenceName("refs/heads/master"),
SingleBranch: true,
URL: url,
Tags: git.AllTags,
// To be able to pull recipe from any branch
SingleBranch: false,
})
if err != nil {
log.Debugf("cloning %s default branch failed, attempting from main branch", url)
_, err := git.PlainClone(dir, false, &git.CloneOptions{
URL: url,
Tags: git.AllTags,
ReferenceName: plumbing.ReferenceName("refs/heads/main"),
SingleBranch: true,
})
if err != nil {
if strings.Contains(err.Error(), "authentication required") {
name := filepath.Base(dir)
return fmt.Errorf("unable to clone %s, does %s exist?", name, url)
}
return err
if strings.Contains(err.Error(), "authentication required") {
name := filepath.Base(dir)
return fmt.Errorf("unable to clone %s, does %s exist?", name, url)
}
return err
}
log.Debugf("%s has been git cloned successfully", dir)