From 4b8e7074e62900ed796cc05bb67a7561f40f899a Mon Sep 17 00:00:00 2001 From: Bruce Williams Date: Mon, 15 Mar 2010 11:16:22 -0700 Subject: ensure = latest to support reference tracking.\n\nWorking with tags, more work needed for branches (at least with git) --- lib/puppet/provider/vcsrepo/git.rb | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'lib/puppet/provider/vcsrepo/git.rb') diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb index 274f25b..ba5065e 100644 --- a/lib/puppet/provider/vcsrepo/git.rb +++ b/lib/puppet/provider/vcsrepo/git.rb @@ -5,7 +5,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo) commands :git => 'git' defaultfor :git => :exists - has_features :bare_repositories + has_features :bare_repositories, :reference_tracking def create if !@resource.value(:source) @@ -37,7 +37,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo) end def revision=(desired) - fetch + pull reset(desired) end @@ -48,6 +48,16 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo) def working_copy_exists? File.directory?(File.join(@resource.value(:path), '.git')) end + + def exists? + working_copy_exists? || bare_exists? + end + + def update_references + at_path do + git('fetch', '--tags', 'origin') + end + end private @@ -68,9 +78,9 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo) git(*args) end - def fetch + def pull at_path do - git('fetch', 'origin') + git('pull', 'origin') end end -- cgit v1.2.3