diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-04 18:47:31 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-04 18:47:31 -0400 |
| commit | 743c35709de77055a3e4947d673219569cd57fb4 (patch) | |
| tree | 6133ddd1497576198df35ae66df27a9416129454 /Git/UnionMerge.hs | |
| parent | cedb6dc503441bfe54881ec646d86dd777635e7d (diff) | |
more zombie fighting
I'm down to 9 places in the code that can produce unwaited for zombies.
Most of these are pretty innocuous, at least for now, are only
used in short-running commands, or commands that run a set of
actions and explicitly reap zombies after each one.
The one from Annex.Branch.files could be trouble later,
since both Command.Fsck and Command.Unused can trigger it,
and the assistant will be doing those eventally. Ditto the one in
Git.LsTree.lsTree, which Command.Unused uses.
The only ones currently affecting the assistant though, are
in Git.LsFiles. Several threads use several of those.
(And yeah, using pipes or ResourceT would be a less ad-hoc approach,
but I don't really feel like ripping my entire code base apart right
now to change a foundation monad. Maybe one of these days..)
Diffstat (limited to 'Git/UnionMerge.hs')
| -rw-r--r-- | Git/UnionMerge.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs index 504147e1d..d77e9313c 100644 --- a/Git/UnionMerge.hs +++ b/Git/UnionMerge.hs @@ -58,9 +58,11 @@ diffOpts = ["--raw", "-z", "-r", "--no-renames", "-l0"] {- Streams update-index changes to perform a merge, - using git to get a raw diff. -} doMerge :: CatFileHandle -> [String] -> Repo -> Streamer -doMerge ch differ repo streamer = gendiff >>= go +doMerge ch differ repo streamer = do + (diff, cleanup) <- pipeNullSplit (map Param differ) repo + go diff + void $ cleanup where - gendiff = pipeNullSplit (map Param differ) repo go [] = noop go (info:file:rest) = mergeFile info file ch repo >>= maybe (go rest) (\l -> streamer l >> go rest) |