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

rename stuff for v5 unlocked files to indicate it's old

Browse source
This commit is contained in:
Joey Hess 2015-12-15 14:08:07 -04:00
parent d1bb518e25
commit a983a3a7a2
Failed to extract signature
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Command/PreCommit.hs
View file

@ -46,7 +46,7 @@ seek ps = lockPreCommitHook $ ifM isDirect
ifM (liftIO Git.haveFalseIndex)
( do
(fs, cleanup) <- inRepo $ Git.typeChangedStaged ps
whenM (anyM isUnlocked fs) $
whenM (anyM isOldUnlocked fs) $
error "Cannot make a partial commit with unlocked annexed files. You should `git annex add` the files you want to commit, and then run git commit."
void $ liftIO cleanup
, do
@ -58,7 +58,7 @@ seek ps = lockPreCommitHook $ ifM isDirect
-- (not needed when repo version uses
-- unlocked pointer files)
unlessM versionSupportsUnlockedPointers $
withFilesUnlockedToBeCommitted startInjectUnlocked ps
withFilesOldUnlockedToBeCommitted startInjectUnlocked ps
)
runAnnexHook preCommitAnnexHook
-- committing changes to a view updates metadata