From 1dcc84e5ee71eb0b85622affc7f097f9b02cb5d9 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Wed, 17 Jul 2013 14:33:36 -0700 Subject: Use git checkout --force instead of short -f everywhere --- lib/puppet/provider/vcsrepo/git.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb index d971e90..33443ce 100644 --- a/lib/puppet/provider/vcsrepo/git.rb +++ b/lib/puppet/provider/vcsrepo/git.rb @@ -203,7 +203,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo) FileUtils.mv(tempdir, File.join(@resource.value(:path), '.git')) if commits_in?(File.join(@resource.value(:path), '.git')) reset('HEAD') - git_with_identity('checkout', '-f') + git_with_identity('checkout', '--force') update_owner_and_excludes end end -- cgit v1.2.3