plusone_nick/abra
0
0
Fork 0
forked from toolshed/abra
Code Pull Requests Activity

fix: standardise checkout options

Browse Source
This commit is contained in:
decentral1se
2021-10-14 12:17:58 +02:00
parent 113bdf9e86
commit ae32b1eed2
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/catalogue/catalogue.go
View File

@ -405,7 +405,6 @@ func GetRecipeVersions(recipeName string) (RecipeVersions, error) {
checkOutOpts := &git.CheckoutOptions{
Create: false,
Force: true,
Keep: false,
Branch: plumbing.ReferenceName(ref.Name()),
}
if err := worktree.Checkout(checkOutOpts); err != nil {
@ -467,7 +466,6 @@ func GetRecipeVersions(recipeName string) (RecipeVersions, error) {
checkOutOpts := &git.CheckoutOptions{
Create: false,
Force: true,
Keep: false,
Branch: plumbing.ReferenceName(refName),
}
if err := worktree.Checkout(checkOutOpts); err != nil {

1
pkg/git/clone.go
View File

@ -62,7 +62,6 @@ func EnsureUpToDate(dir string) error {
checkOutOpts := &git.CheckoutOptions{
Create: false,
Force: true,
Keep: false,
Branch: plumbing.ReferenceName(refName),
}
if err := worktree.Checkout(checkOutOpts); err != nil {

7
pkg/recipe/recipe.go
View File

@ -142,7 +142,11 @@ func EnsureVersion(recipeName, version string) error {
return err
}
opts := &git.CheckoutOptions{Branch: tagRef, Keep: true}
opts := &git.CheckoutOptions{
Branch: tagRef,
Create: false,
Force: true,
}
if err := worktree.Checkout(opts); err != nil {
return err
}
@ -181,7 +185,6 @@ func EnsureLatest(recipeName string) error {
checkOutOpts := &git.CheckoutOptions{
Create: false,
Force: true,
Keep: false,
Branch: plumbing.ReferenceName(refName),
}