Merge pull request #224 from puppet-by-examples/single-branch

Shallow clone with one commit that corresponds to arbitrary tag from arbitrary branch

diff --combined lib/puppet/provider/vcsrepo/git.rb
index 000032e,8a8c12f..8101253
--- 1/lib/puppet/provider/vcsrepo/git.rb
--- 2/lib/puppet/provider/vcsrepo/git.rb
+++ b/lib/puppet/provider/vcsrepo/git.rb
@@@ -5,7 -5,7 +5,7 @@@ Puppet::Type.type(:vcsrepo).provide(:gi
  
    commands :git => 'git'
  
-   has_features :bare_repositories, :reference_tracking, :ssh_identity, :multiple_remotes, :user, :depth, :submodules
+   has_features :bare_repositories, :reference_tracking, :ssh_identity, :multiple_remotes, :user, :depth, :branch, :submodules
  
    def create
      if @resource.value(:revision) and @resource.value(:ensure) == :bare
@@@ -142,8 -142,7 +142,8 @@@
      # we loop around the hash. Otherwise, we assume single url specified
      # in source property
      if @resource.value(:source).is_a?(Hash)
 -      @resource.value(:source).each do |remote_name, remote_url|
 +      @resource.value(:source).keys.sort.each do |remote_name|
 +        remote_url = @resource.value(:source)[remote_name]
          at_path { do_update |= update_remote_url(remote_name, remote_url) }
        end
      else
@@@ -181,6 -180,9 +181,9 @@@
      if @resource.value(:depth) and @resource.value(:depth).to_i > 0
        args.push('--depth', @resource.value(:depth).to_s)
      end
+     if @resource.value(:branch)
+       args.push('--branch', @resource.value(:branch).to_s)
+     end
      if @resource.value(:ensure) == :bare
        args << '--bare'
      end

diff --combined lib/puppet/type/vcsrepo.rb
index 52eace8,fdcf9ab..e5dfbb5
--- 1/lib/puppet/type/vcsrepo.rb
--- 2/lib/puppet/type/vcsrepo.rb
+++ b/lib/puppet/type/vcsrepo.rb
@@@ -40,15 -40,15 +40,18 @@@ Puppet::Type.newtype(:vcsrepo) d
    feature :depth,
            "The provider can do shallow clones"
  
+   feature :branch,
+           "The name of the branch"
+ 
    feature :p4config,
            "The provider understands Perforce Configuration"
  
    feature :submodules,
            "The repository contains submodules which can be optionally initialized"
  
 +  feature :conflict,
 +          "The provider supports automatic conflict resolution"
 +
    ensurable do
      attr_accessor :latest
  
@@@ -207,6 -207,10 +210,10 @@@
      desc "The value to be used to do a shallow clone."
    end
  
+   newparam :branch, :required_features => [:branch] do
+     desc "The name of the branch to clone."
+   end
+ 
    newparam :p4config, :required_features => [:p4config] do
      desc "The Perforce P4CONFIG environment."
    end
@@@ -217,10 -221,6 +224,10 @@@
      defaultto true
    end
  
 +  newparam :conflict do
 +    desc "The action to take if conflicts exist between repository and working copy"
 +  end
 +
    autorequire(:package) do
      ['git', 'git-core']
    end