From 6d13790afa236b958eec9e8a0ea1e75125d90351 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 22 Nov 2014 15:58:09 -0400
Subject: [PATCH] propellor spin

---
 src/Propellor/CmdLine.hs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index ea6cabf..e719e14 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -156,14 +156,15 @@ updateFirst' cmdline next = ifM fetchOrigin
 
 spin :: HostName -> Maybe HostName -> Host -> IO ()
 spin target relay hst = do
-	void $ actionMessage "Git commit" $
-		gitCommit [Param "--allow-empty", Param "-a", Param "-m", Param "propellor spin"]
-	-- Push to central origin repo first, if possible.
-	-- The remote propellor will pull from there, which avoids
-	-- us needing to send stuff directly to the remote host.
-	whenM hasOrigin $
-		void $ actionMessage "Push to central git repository" $
-			boolSystem "git" [Param "push"]
+	unless relaying $ do
+		void $ actionMessage "Git commit" $
+			gitCommit [Param "--allow-empty", Param "-a", Param "-m", Param "propellor spin"]
+		-- Push to central origin repo first, if possible.
+		-- The remote propellor will pull from there, which avoids
+		-- us needing to send stuff directly to the remote host.
+		whenM hasOrigin $
+			void $ actionMessage "Push to central git repository" $
+				boolSystem "git" [Param "push"]
 	
 	cacheparams <- toCommand <$> sshCachingParams hn
 	when (isJust relay) $
@@ -179,6 +180,7 @@ spin target relay hst = do
   where
 	hn = fromMaybe target relay
 	user = "root@"++hn
+	relaying = relay == Just target
 
 	mkcmd = shellWrap . intercalate " ; "