diff --git a/pkg/catalogue/catalogue.go b/pkg/catalogue/catalogue.go index 233ec048..29ca131f 100644 --- a/pkg/catalogue/catalogue.go +++ b/pkg/catalogue/catalogue.go @@ -525,7 +525,7 @@ func GetRecipeVersions(recipeName string) (RecipeVersions, error) { checkOutOpts := &git.CheckoutOptions{ Create: false, - Force: true, + Keep: true, Branch: plumbing.ReferenceName(ref.Name()), } if err := worktree.Checkout(checkOutOpts); err != nil { @@ -586,7 +586,7 @@ func GetRecipeVersions(recipeName string) (RecipeVersions, error) { refName := fmt.Sprintf("refs/heads/%s", branch) checkOutOpts := &git.CheckoutOptions{ Create: false, - Force: true, + Keep: true, Branch: plumbing.ReferenceName(refName), } if err := worktree.Checkout(checkOutOpts); err != nil { diff --git a/pkg/git/clone.go b/pkg/git/clone.go index e099aac9..9e25e353 100644 --- a/pkg/git/clone.go +++ b/pkg/git/clone.go @@ -76,7 +76,7 @@ func EnsureUpToDate(dir string) error { refName := fmt.Sprintf("refs/heads/%s", branch) checkOutOpts := &git.CheckoutOptions{ Create: false, - Force: true, + Keep: true, Branch: plumbing.ReferenceName(refName), } if err := worktree.Checkout(checkOutOpts); err != nil { diff --git a/pkg/recipe/recipe.go b/pkg/recipe/recipe.go index c17317ca..225c5b44 100644 --- a/pkg/recipe/recipe.go +++ b/pkg/recipe/recipe.go @@ -168,7 +168,7 @@ func EnsureVersion(recipeName, version string) error { opts := &git.CheckoutOptions{ Branch: tagRef, Create: false, - Force: true, + Keep: true, } if err := worktree.Checkout(opts); err != nil { return err @@ -220,7 +220,7 @@ func EnsureLatest(recipeName string) error { refName := fmt.Sprintf("refs/heads/%s", branch) checkOutOpts := &git.CheckoutOptions{ Create: false, - Force: true, + Keep: true, Branch: plumbing.ReferenceName(refName), }