summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-04 19:56:32 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-04 19:56:32 -0400
commitcd699ff50b8434b52e2f51d06414e8431b407482 (patch)
tree77291f6d6f6c340c41f9da5b3bbfeae4117d7764 /Annex
parentbdbfe36e945e97d66c965bc7227d1457372bce32 (diff)
fix last zombies in the assistant
Made Git.LsFiles return cleanup actions, and everything waits on processes now, except of course for Seek.
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Branch.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs
index 99dba623c..b1a807f24 100644
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -262,7 +262,9 @@ files = do
update
withIndex $ do
bfiles <- inRepo $ Git.Command.pipeNullSplitZombie
- [Params "ls-tree --name-only -r -z", Param $ show fullname]
+ [ Params "ls-tree --name-only -r -z"
+ , Param $ show fullname
+ ]
jfiles <- getJournalledFiles
return $ jfiles ++ bfiles