Merge pull request #44 from karellen/issue_43

Force git to clobber tags in the git cache
karellen · Dec 29, 2023 · 230e592 · 230e592
2 parents 33a60fc + dafae30
commit 230e592
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build.py b/build.py
@@ -27,7 +27,7 @@
 use_plugin("filter_resources")
 
 name = "kubernator"
-version = "1.0.11"
+version = "1.0.12"
 
 summary = "Kubernator is the a pluggable framework for K8S provisioning"
 authors = [Author("Express Systems USA, Inc.", "")]

diff --git a/src/main/python/kubernator/api.py b/src/main/python/kubernator/api.py
@@ -740,7 +740,7 @@ def init(self, logger, context):
                              self.local_dir)
             run(["git", "config", "remote.origin.fetch", f"+refs/heads/{ref}:refs/remotes/origin/{ref}"],
                 stdout_logger, stderr_logger, cwd=git_cache).wait()
-            run(["git", "fetch", "-pPt"], stdout_logger, stderr_logger, cwd=git_cache).wait()
+            run(["git", "fetch", "-pPt", "--force"], stdout_logger, stderr_logger, cwd=git_cache).wait()
             run(["git", "checkout", ref], stdout_logger, stderr_logger, cwd=git_cache).wait()
             run(["git", "clean", "-f"], stdout_logger, stderr_logger, cwd=git_cache).wait()
             run(["git", "reset", "--hard", ref, "--"], stdout_logger, stderr_logger, cwd=git_cache).wait()