mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

uninit: remove unncessary ExistSuccess

Browse source 
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.
This commit is contained in:
Joey Hess 2023-05-11 13:50:20 -04:00
parent 271f3b1ab4
commit 55dfa929d6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Command/Uninit.hs
View file

@ -54,8 +54,7 @@ seek = withNothing $ do
withFilesInGitAnnex ww (Command.Unannex.seeker True) withFilesInGitAnnex ww (Command.Unannex.seeker True)
=<< workTreeItems ww [] =<< workTreeItems ww []
whenM (checkok False $ commandAction $ removeAnnexDir recordok) $ whenM (checkok False $ commandAction $ removeAnnexDir recordok) $
whenM (checkok False $ commandAction $ completeUnitialize recordok) $ commandAction completeUnitialize
liftIO exitSuccess
where where
ww = WarnUnmatchLsFiles "uninit" ww = WarnUnmatchLsFiles "uninit"
checksymlinks recordnotok (_, f) = checksymlinks recordnotok (_, f) =
@ -163,12 +162,12 @@ removeUnannexed = go []
s <- R.getFileStatus f s <- R.getFileStatus f
return $ linkCount s > 1 return $ linkCount s > 1
completeUnitialize :: CommandCleanup -> CommandStart completeUnitialize :: CommandStart
completeUnitialize recordok = completeUnitialize =
starting ("uninit finish") (ActionItemOther Nothing) (SeekInput []) $ do starting ("uninit finish") (ActionItemOther Nothing) (SeekInput []) $ do
uninitialize uninitialize
removeAnnexBranch removeAnnexBranch
next recordok next $ return True
removeAnnexBranch :: Annex () removeAnnexBranch :: Annex ()
removeAnnexBranch = do removeAnnexBranch = do