add force parameter defaulted to false to control reset behavior

Author: wfarr

lib/puppet/provider/repository/git.rb

@@ -1,9 +1,11 @@
 require 'fileutils'
+require 'puppet/util/errors'
 require 'puppet/util/execution'
 require 'shellwords'
 
 Puppet::Type.type(:repository).provide :git do
   include Puppet::Util::Execution
+  include Puppet::Util::Errors
 
   optional_commands :git => 'git'
 
@@ -47,7 +49,18 @@ def ensure_revision
     create unless cloned?
 
     Dir.chdir @resource[:path] do
-      execute [command(:git), "reset", "--hard", target_revision], command_opts
+      status = execute [command(:git), "status", "--porcelain"], command_opts
+
+      if status.empty?
+        execute [command(:git), "reset", "--hard", target_revision], command_opts
+      else
+        if @resource[:force]
+          Puppet.warning("Repository[#{@resource[:name]}] tree is dirty and force is true: doing hard reset!")
+          execute [command(:git), "reset", "--hard", target_revision], command_opts
+        else
+          fail("Repository[#{@resource[:name]}] tree is dirty and force is false: cannot sync resource!")
+        end
+      end
     end
   end
 

lib/puppet/type/repository.rb

@@ -84,6 +84,19 @@ def insync?(is)
     desc "Extra actions or information for a provider"
   end
 
+  newparam :force do
+    desc "Whether or not to force reset if the working tree is dirty"
+
+    validate do |value|
+      unless value.is_a?(TrueClass) || value.is_a?(FalseClass)
+        raise Puppet::Error, \
+          "Force must be true or false"
+      end
+    end
+
+    defaultto false
+  end
+
   validate do
     if self[:source].nil?
       # ensure => absent does not need a source