From 7fd8150b1fca025f9763eeb4ba77df9f92d2685f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Nov 2014 17:12:17 -0400 Subject: propellor spin --- src/Propellor/CmdLine.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index e7da0a80..db7d93ae 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -315,8 +315,10 @@ boot = do hout <- dup stdOutput hClose stdin hClose stdout - unlessM (boolSystem "git" [Param "pull", Param "--progress", Param "--upload-pack", Param $ "./propellor --gitpush " ++ show hin ++ " " ++ show hout, Param "."]) $ - errorMessage "git pull from client failed" + unlessM (boolSystem "git" [Param "fetch", Param "--progress", Param "--upload-pack", Param $ "./propellor --gitpush " ++ show hin ++ " " ++ show hout, Param "."]) $ + errorMessage "git fetch from client failed" + unlessM (boolSystem "git" [Param "merge", Param "--quiet", Param "FETCH_HEAD"]) $ + errorMessage "git merge failed" -- Shim for git push over the propellor ssh channel. -- Reads from stdin and sends it to hout; -- cgit v1.2.3