diff --git a/pkg/catalogue/catalogue.go b/pkg/catalogue/catalogue.go index f41b8dab3..3e2f46344 100644 --- a/pkg/catalogue/catalogue.go +++ b/pkg/catalogue/catalogue.go @@ -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 { diff --git a/pkg/git/clone.go b/pkg/git/clone.go index f131f87e9..3b86e465b 100644 --- a/pkg/git/clone.go +++ b/pkg/git/clone.go @@ -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 { diff --git a/pkg/recipe/recipe.go b/pkg/recipe/recipe.go index e987e898e..c84d863d3 100644 --- a/pkg/recipe/recipe.go +++ b/pkg/recipe/recipe.go @@ -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), }