cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Work around broken git pull option parser in git 2.5.0, which broke use of --upload-pack to send a git push when running propellor --spin.

This commit is contained in:
Joey Hess 2015-07-30 12:01:15 -04:00
parent 055e28199c
commit f387bbcf2d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -8,6 +8,9 @@ propellor (2.7.0) UNRELEASED; urgency=medium
* Added onChangeFlagOnFail which is often a safer alternative to * Added onChangeFlagOnFail which is often a safer alternative to
onChange. onChange.
Thanks, Antoine Eiche. Thanks, Antoine Eiche.
* Work around broken git pull option parser in git 2.5.0,
which broke use of --upload-pack to send a git push when running
propellor --spin.
-- Joey Hess <id@joeyh.name> Mon, 20 Jul 2015 12:01:38 -0400 -- Joey Hess <id@joeyh.name> Mon, 20 Jul 2015 12:01:38 -0400

8
src/Propellor/Spin.hs
View File

@ -147,11 +147,15 @@ update forhost = do
hout <- dup stdOutput hout <- dup stdOutput
hClose stdin hClose stdin
hClose stdout hClose stdout
-- Not using git pull because git 2.5.0 badly
-- broke its option parser.
unlessM (boolSystem "git" (pullparams hin hout)) $ 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 where
pullparams hin hout = pullparams hin hout =
[ Param "pull" [ Param "fetch"
, Param "--progress" , Param "--progress"
, Param "--upload-pack" , Param "--upload-pack"
, Param $ "./propellor --gitpush " ++ show hin ++ " " ++ show hout , Param $ "./propellor --gitpush " ++ show hin ++ " " ++ show hout