diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-04 19:56:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-04 19:56:32 -0400 |
| commit | cd699ff50b8434b52e2f51d06414e8431b407482 (patch) | |
| tree | 77291f6d6f6c340c41f9da5b3bbfeae4117d7764 /Command/Unannex.hs | |
| parent | bdbfe36e945e97d66c965bc7227d1457372bce32 (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 'Command/Unannex.hs')
| -rw-r--r-- | Command/Unannex.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Command/Unannex.hs b/Command/Unannex.hs index bf931adfd..67d81bec0 100644 --- a/Command/Unannex.hs +++ b/Command/Unannex.hs @@ -39,12 +39,14 @@ cleanup file key = do -- Commit that removal now, to avoid later confusing the -- pre-commit hook if this file is later added back to -- git as a normal, non-annexed file. - whenM (not . null <$> inRepo (LsFiles.staged [file])) $ do + (s, clean) <- inRepo $ LsFiles.staged [file] + when (not $ null s) $ do showOutput inRepo $ Git.Command.run "commit" [ Param "-q", Params "-m", Param "content removed from git annex", Param "--", File file] + void $ liftIO clean ifM (Annex.getState Annex.fast) ( do |