From 3a0842d9f8f74d84cba280124d7685bf75a4c0d3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 27 Aug 2019 12:26:52 -0400 Subject: [PATCH] fix bug introduced in direct mode conversion oops, the code was "if direct && not present" and I removed the direct which made the wrong path be taken. --- Command/Fsck.hs | 4 +--- doc/bugs/direct_mode_upgrade_with_deleted_file.mdwn | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Command/Fsck.hs b/Command/Fsck.hs index c18e8d2430..bed59a52c7 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -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 = diff --git a/doc/bugs/direct_mode_upgrade_with_deleted_file.mdwn b/doc/bugs/direct_mode_upgrade_with_deleted_file.mdwn index cec02a4a3a..c62f2a396b 100644 --- a/doc/bugs/direct_mode_upgrade_with_deleted_file.mdwn +++ b/doc/bugs/direct_mode_upgrade_with_deleted_file.mdwn @@ -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]]