projects
/
puppet_vcsrepo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ff26072
)
Use git checkout --force instead of short -f everywhere
author
Aaron Stone
<aaron@serendipity.cx>
Wed, 17 Jul 2013 21:33:36 +0000
(14:33 -0700)
committer
Aaron Stone
<aaron@serendipity.cx>
Wed, 17 Jul 2013 21:33:36 +0000
(14:33 -0700)
lib/puppet/provider/vcsrepo/git.rb
patch
|
blob
|
history
diff --git
a/lib/puppet/provider/vcsrepo/git.rb
b/lib/puppet/provider/vcsrepo/git.rb
index
d971e90
..
33443ce
100644
(file)
--- 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