Ensure old refs are pruned on fetch

puppetlabs · Nov 22, 2024 · 16f5a67 · 16f5a67
1 parent cf6b2fd
commit 16f5a67
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/r10k/git/rugged/working_repository.rb b/lib/r10k/git/rugged/working_repository.rb
@@ -89,7 +89,7 @@ def fetch(remote_name = 'origin')
     remote = remotes[remote_name]
     proxy = R10K::Git.get_proxy_for_remote(remote)
 
-    options = {:credentials => credentials, :proxy_url => proxy}
+    options = {:credentials => credentials, :proxy_url => proxy, :prune => true}
     refspecs = ["+refs/heads/*:refs/remotes/#{remote_name}/*"]
 
     results = nil

diff --git a/lib/r10k/git/shellgit/thin_repository.rb b/lib/r10k/git/shellgit/thin_repository.rb
@@ -31,7 +31,7 @@ def clone(remote, opts = {})
 
   # Fetch refs from the backing bare Git repository.
   def fetch(remote = 'cache')
-    git ['fetch', remote], :path => @path.to_s
+    git ['fetch', remote, '--prune'], :path => @path.to_s
   end
 
   # @return [String] The origin remote URL