codegod100/abra
0
0
Fork 0
forked from toolshed/abra
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: branch checking logic

Browse Source 
See https://github.com/go-git/go-git/issues/518 for why this is needed.
This commit is contained in:
Franz Heinzmann (Frando)
2022-08-11 14:14:31 +02:00
committed by decentral1se
parent b42d5bf113
commit 8458e61d17
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/recipe/recipe.go
View File

@ -625,8 +625,8 @@ func GetDefaultBranch(repo *git.Repository, recipeName string) (plumbing.Referen
}
branch := "master"
if _, err := repo.Branch("master"); err != nil {
if _, err := repo.Branch("main"); err != nil {
if !gitPkg.HasBranch(repo, "master") {
if !gitPkg.HasBranch(repo, "main") {
return "", fmt.Errorf("failed to select default branch in %s", recipeDir)
}
branch = "main"