mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

avoid pre-commit check having to do with v5 unlocked files when in v6 mode

Browse source
This commit is contained in:
Joey Hess 2015-12-15 14:09:36 -04:00
parent a983a3a7a2
commit d245a80518
Failed to extract signature
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Command/PreCommit.hs
View file

@ -43,7 +43,7 @@ seek ps = lockPreCommitHook $ ifM isDirect
withWords startDirect ps withWords startDirect ps
runAnnexHook preCommitAnnexHook runAnnexHook preCommitAnnexHook
, do , do
ifM (liftIO Git.haveFalseIndex) ifM (not <$> versionSupportsUnlockedPointers <&&> liftIO Git.haveFalseIndex)
( do ( do
(fs, cleanup) <- inRepo $ Git.typeChangedStaged ps (fs, cleanup) <- inRepo $ Git.typeChangedStaged ps
whenM (anyM isOldUnlocked fs) $ whenM (anyM isOldUnlocked fs) $