diff options
| author | Aaron Stone <aaron@serendipity.cx> | 2013-07-17 14:33:36 -0700 |
|---|---|---|
| committer | Aaron Stone <aaron@serendipity.cx> | 2013-07-17 14:33:36 -0700 |
| commit | 1dcc84e5ee71eb0b85622affc7f097f9b02cb5d9 (patch) | |
| tree | 9afbae54149a4b070e2b3b4e4c7804e15d4a5a51 | |
| parent | ff2607235cd29114212bd49186319a7bf0980944 (diff) | |
Use git checkout --force instead of short -f everywhere
| -rw-r--r-- | lib/puppet/provider/vcsrepo/git.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |