summaryrefslogtreecommitdiff
path: root/Command/PreCommit.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-15 14:09:36 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-15 14:09:36 -0400
commit26f4b3b9a9e5d7a75a2bf234de10a8909d913109 (patch)
treedbb66d05740c2e8399b56ab15a4a3b6dc942160f /Command/PreCommit.hs
parent4419ed21e64d5713e83503b1b9b6120ba10cd1b6 (diff)
avoid pre-commit check having to do with v5 unlocked files when in v6 mode
Diffstat (limited to 'Command/PreCommit.hs')
-rw-r--r--Command/PreCommit.hs2
1 files changed, 1 insertions, 1 deletions
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) $