From c69186803a7187c93078b77b0fafb40eadbb6d13 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Fri, 3 Feb 2012 18:38:12 +0000
Subject: [PATCH] Fix git usage in the planet puppet module

Change-Id: Ia13cc44c219e53d905157ae6f4f2305d7b1115dd
---
 modules/planet/manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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}"