summaryrefslogtreecommitdiff
path: root/CmdLine.hs
diff options
context:
space:
mode:
Diffstat (limited to 'CmdLine.hs')
-rw-r--r--CmdLine.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/CmdLine.hs b/CmdLine.hs
index edbe5e107..b3aeb57aa 100644
--- a/CmdLine.hs
+++ b/CmdLine.hs
@@ -43,7 +43,7 @@ dispatch fuzzyok allargs allcmds commonoptions fields header getgitrepo = do
forM_ fields $ \(f, v) -> Annex.setField f v
sequence_ flags
prepCommand cmd params
- tryRun state' cmd $ [startup] ++ actions ++ [shutdown $ cmdoneshot cmd]
+ tryRun state' cmd $ [startup] ++ actions ++ [shutdown $ cmdnocommit cmd]
where
err msg = msg ++ "\n\n" ++ usage header allcmds commonoptions
cmd = Prelude.head cmds
@@ -112,8 +112,8 @@ startup = return True
{- Cleanup actions. -}
shutdown :: Bool -> Annex Bool
-shutdown oneshot = do
- saveState oneshot
+shutdown nocommit = do
+ saveState nocommit
sequence_ =<< M.elems <$> Annex.getState Annex.cleanup
liftIO Git.Command.reap -- zombies from long-running git processes
sshCleanup -- ssh connection caching