fix: fast-forward template checkout
This commit is contained in:
parent
8916d6ee4c
commit
df1a95f349
|
|
@ -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 {
|
||||
|
|
|
|||
Loading…
Reference in a new issue