From 6eaf1e333399625f48f03fb504811a397ab9e0cc Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 12 Jul 2016 13:41:03 -0400
Subject: fsck: Fix a reversion in direct mode fsck of a file that is present
 when the location log thinks it is not. Reversion introduced in version
 5.20151208.

---
 Command/Fsck.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Command')

diff --git a/Command/Fsck.hs b/Command/Fsck.hs
index 28ce7752d..6bc91f0ef 100644
--- a/Command/Fsck.hs
+++ b/Command/Fsck.hs
@@ -214,11 +214,11 @@ fixLink key file = do
  - in this repository only. -}
 verifyLocationLog :: Key -> KeyStatus -> String -> Annex Bool
 verifyLocationLog key keystatus desc = do
+	direct <- isDirect
 	obj <- calcRepo $ gitAnnexLocation key
-	present <- if isKeyUnlocked keystatus
+	present <- if not direct && isKeyUnlocked keystatus
 		then liftIO (doesFileExist obj)
 		else inAnnex key
-	direct <- isDirect
 	u <- getUUID
 	
 	{- Since we're checking that a key's object file is present, throw
-- 
cgit v1.2.3