From ae32b1eed278399d5bf695e5bb029b845734ebce Mon Sep 17 00:00:00 2001
From: decentral1se <lukewm@riseup.net>
Date: Thu, 14 Oct 2021 12:17:58 +0200
Subject: [PATCH] fix: standardise checkout options

---
 pkg/catalogue/catalogue.go | 2 --
 pkg/git/clone.go           | 1 -
 pkg/recipe/recipe.go       | 7 +++++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/catalogue/catalogue.go b/pkg/catalogue/catalogue.go
index f41b8dab..3e2f4634 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 f131f87e..3b86e465 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 e987e898..c84d863d 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),
 	}