summaryrefslogtreecommitdiff
path: root/src/Propellor/CmdLine.hs
diff options
context:
space:
mode:
authorJoey Hess2014-11-18 17:12:17 -0400
committerJoey Hess2014-11-18 17:12:17 -0400
commit7fd8150b1fca025f9763eeb4ba77df9f92d2685f (patch)
tree8145a0bb317cb52bf6951bdf00335d0d8a93280a /src/Propellor/CmdLine.hs
parent4f352327be32b045585cf134446613e0be625e80 (diff)
propellor spin
Diffstat (limited to 'src/Propellor/CmdLine.hs')
-rw-r--r--src/Propellor/CmdLine.hs6
1 files changed, 4 insertions, 2 deletions
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;