summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2015-07-30 12:10:58 -0400
committerJoey Hess2015-07-30 12:10:58 -0400
commit37cf983363d5acaa8530d4b93e7221de04bea6f1 (patch)
treec67280cedaf636fcea8cc50871646fb348f40c62 /src
parentf17020cb7fa2b2967b96afc10a2cd82de8a977cc (diff)
parent6fe4b0cd9174aad50987a41784f2e63cf8f1ddd1 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Spin.hs8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs
index 3ff1ec21..61d519c3 100644
--- a/src/Propellor/Spin.hs
+++ b/src/Propellor/Spin.hs
@@ -147,11 +147,15 @@ update forhost = do
hout <- dup stdOutput
hClose stdin
hClose stdout
+ -- Not using git pull because git 2.5.0 badly
+ -- broke its option parser.
unlessM (boolSystem "git" (pullparams hin hout)) $
- errorMessage "git pull from client failed"
+ errorMessage "git fetch from client failed"
+ unlessM (boolSystem "git" [Param "merge", Param "FETCH_HEAD"]) $
+ errorMessage "git merge from client failed"
where
pullparams hin hout =
- [ Param "pull"
+ [ Param "fetch"
, Param "--progress"
, Param "--upload-pack"
, Param $ "./propellor --gitpush " ++ show hin ++ " " ++ show hout