diff --git a/modules/planet/manifests/site.pp b/modules/planet/manifests/site.pp index 98ea64cbe8..f38a34c1dc 100644 --- a/modules/planet/manifests/site.pp +++ b/modules/planet/manifests/site.pp @@ -16,7 +16,7 @@ define planet::site($git_url) { # if we already have the mercurial repo the pull updates exec { "update_${name}_planet": - command => "git pull", + command => "git pull --ff-only", cwd => "/var/lib/planet/${name}", path => "/bin:/usr/bin", onlyif => "test -d /var/lib/planet/${name}"