first prune, then fetch

puppetlabs · Jan 3, 2025 · d435059 · d435059
1 parent 6b5a7b6
commit d435059
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/r10k/git/stateful_repository.rb b/lib/r10k/git/stateful_repository.rb
@@ -63,8 +63,8 @@ def sync(ref, force=true, exclude_spec=true)
       if force
         logger.warn(_("Overwriting local modifications to %{repo_path}") % {repo_path: @repo.path})
         logger.debug(_("Updating %{repo_path} to %{ref}") % {repo_path: @repo.path, ref: ref })
-        @repo.fetch
         @repo.prune
+        @repo.fetch
         @repo.checkout(sha, {:force => force})
       else
         logger.warn(_("Skipping %{repo_path} due to local modifications") % {repo_path: @repo.path})