From d245a805181e7b12ae7a01686fb598b147f6dbd5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 15 Dec 2015 14:09:36 -0400 Subject: [PATCH] avoid pre-commit check having to do with v5 unlocked files when in v6 mode --- Command/PreCommit.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Command/PreCommit.hs b/Command/PreCommit.hs index 71a9f86f8c..cbf7f6e3de 100644 --- a/Command/PreCommit.hs +++ b/Command/PreCommit.hs @@ -43,7 +43,7 @@ seek ps = lockPreCommitHook $ ifM isDirect withWords startDirect ps runAnnexHook preCommitAnnexHook , do - ifM (liftIO Git.haveFalseIndex) + ifM (not <$> versionSupportsUnlockedPointers <&&> liftIO Git.haveFalseIndex) ( do (fs, cleanup) <- inRepo $ Git.typeChangedStaged ps whenM (anyM isOldUnlocked fs) $