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

fix bug introduced in direct mode conversion

Browse source 
oops, the code was "if direct && not present" and I removed the direct
which made the wrong path be taken.
This commit is contained in:
Joey Hess 2019-08-27 12:26:52 -04:00
parent a51a479fb9
commit 3a0842d9f8
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Command/Fsck.hs
View file

@ -248,9 +248,7 @@ verifyLocationLog key keystatus ai = do
whenM (annexSecureHashesOnly <$> Annex.getGitConfig) $
warning $ "** Despite annex.securehashesonly being set, " ++ obj ++ " has content present in the annex using an insecure " ++ decodeBS (formatKeyVariety (keyVariety key)) ++ " key"
if not present
then return True
else verifyLocationLog' key ai present u (logChange key u)
verifyLocationLog' key ai present u (logChange key u)
verifyLocationLogRemote :: Key -> ActionItem -> Remote -> Bool -> Annex Bool
verifyLocationLogRemote key ai remote present =

3
doc/bugs/direct_mode_upgrade_with_deleted_file.mdwn
View file

@ -13,4 +13,5 @@ present. And does not fix the location log.
This part may not be specific to this case, seems it must be some bug in
fsck?
--[[Joey]]
> It was, a new bug introduced while removing the direct mode code. Fixed
> that part. --[[Joey]]