From 55dfa929d6dd86eccf8acdced8135b795c13c041 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 May 2023 13:50:20 -0400 Subject: [PATCH] uninit: remove unncessary ExistSuccess That was added in 2011 to prevent writing to the git-annex branch on shutdown. But, the use of saveState causes pending git-annex branch writes to be completed before the branch is deleted. So, an unusual exit is not needed. --- Command/Uninit.hs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Command/Uninit.hs b/Command/Uninit.hs index 59b8f2845b..a26cb129fb 100644 --- a/Command/Uninit.hs +++ b/Command/Uninit.hs @@ -54,8 +54,7 @@ seek = withNothing $ do withFilesInGitAnnex ww (Command.Unannex.seeker True) =<< workTreeItems ww [] whenM (checkok False $ commandAction $ removeAnnexDir recordok) $ - whenM (checkok False $ commandAction $ completeUnitialize recordok) $ - liftIO exitSuccess + commandAction completeUnitialize where ww = WarnUnmatchLsFiles "uninit" checksymlinks recordnotok (_, f) = @@ -163,12 +162,12 @@ removeUnannexed = go [] s <- R.getFileStatus f return $ linkCount s > 1 -completeUnitialize :: CommandCleanup -> CommandStart -completeUnitialize recordok = +completeUnitialize :: CommandStart +completeUnitialize = starting ("uninit finish") (ActionItemOther Nothing) (SeekInput []) $ do uninitialize removeAnnexBranch - next recordok + next $ return True removeAnnexBranch :: Annex () removeAnnexBranch = do