From 26f4b3b9a9e5d7a75a2bf234de10a8909d913109 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 15 Dec 2015 14:09:36 -0400 Subject: 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(-) (limited to 'Command/PreCommit.hs') diff --git a/Command/PreCommit.hs b/Command/PreCommit.hs index 71a9f86f8..cbf7f6e3d 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) $ -- cgit v1.2.3