summaryrefslogtreecommitdiff
path: root/src/Propellor/CmdLine.hs
diff options
context:
space:
mode:
authorJoey Hess2014-11-18 17:26:02 -0400
committerJoey Hess2014-11-18 17:26:02 -0400
commit74e067fa7640847cb0395ab4bf17c1d01c3b9349 (patch)
tree467c4495fda908faea5d6f03fe41e9ba3c57d117 /src/Propellor/CmdLine.hs
parent4dd35537e656c334350f477e66c6ba93501d6e9e (diff)
propellor spin
Diffstat (limited to 'src/Propellor/CmdLine.hs')
-rw-r--r--src/Propellor/CmdLine.hs6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index db7d93ae..e7da0a80 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -315,10 +315,8 @@ boot = do
hout <- dup stdOutput
hClose stdin
hClose stdout
- 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"
+ unlessM (boolSystem "git" [Param "pull", Param "--progress", Param "--upload-pack", Param $ "./propellor --gitpush " ++ show hin ++ " " ++ show hout, Param "."]) $
+ errorMessage "git pull from client failed"
-- Shim for git push over the propellor ssh channel.
-- Reads from stdin and sends it to hout;