From a7156b875c2c87ec512262d16f08fdf4d7837254 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Jul 2020 11:21:43 -0400 Subject: [PATCH] fix fsck reversion 75aab72d23ebf8ef0d56d7dd74c121e33d64f1f6 made fsck skip files whose content is not present, but it should complain if there are not enough copies. --- Command/Fsck.hs | 2 +- doc/bugs/failing_tests_in_master.mdwn | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Command/Fsck.hs b/Command/Fsck.hs index 3c972d3f0a..7508bc761d 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -94,7 +94,7 @@ seek o = startConcurrency commandStages $ do i <- prepIncremental u (incrementalOpt o) let seeker = AnnexedFileSeeker { seekAction = commandAction' (start from i) - , checkContentPresent = Just True + , checkContentPresent = Nothing , usesLocationLog = True } withKeyOptions (keyOptions o) False diff --git a/doc/bugs/failing_tests_in_master.mdwn b/doc/bugs/failing_tests_in_master.mdwn index 914e82fe97..05c4e3d9da 100644 --- a/doc/bugs/failing_tests_in_master.mdwn +++ b/doc/bugs/failing_tests_in_master.mdwn @@ -12,3 +12,15 @@ checkContentPresent is set. Everything in that and related commits needs to be re-examined to make sure no other inAnnex checks were lost. + +> Well, I didn't find any others. + +The fsck failure is that it fails to fail when there are 0 copies of the +file. Same basic cause, but the other direction, it was skipping files +whose content is not present. Also introduced in [[!commit +75aab72d23ebf8ef0d56d7dd74c121e33d64f1f6]]. + +So, also need to audit everything with checkContentPresent = Just True +etc to make sure it's right. Ok, done, there were not many using it yet. + +[[done]] --[[Joey]]