From df1a95f34951988497eaa5b27002bf0f78482934 Mon Sep 17 00:00:00 2001
From: eding <edin.grech@gmail.com>
Date: Mon, 20 Jul 2026 23:47:53 +0200
Subject: [PATCH] fix: fast-forward template checkout

---
 internal/bootstrap/bootstrap.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/internal/bootstrap/bootstrap.go b/internal/bootstrap/bootstrap.go
index 4d03b17..f5f3846 100644
--- a/internal/bootstrap/bootstrap.go
+++ b/internal/bootstrap/bootstrap.go
@@ -90,7 +90,10 @@ func ensureRepo(dir, repoURL, ref string) error {
 	if err := utils.RunCommandInDir(dir, "git", "fetch", "origin"); err != nil {
 		return err
 	}
-	return utils.RunCommandInDir(dir, "git", "checkout", ref)
+	if err := utils.RunCommandInDir(dir, "git", "checkout", ref); err != nil {
+		return err
+	}
+	return utils.RunCommandInDir(dir, "git", "pull", "--ff-only", "origin", ref)
 }
 
 func ensureTalosConfig(generatedDir string, cfg config.Config) error {