Fix bug that caused typechanged symlinks to be assumed to be unlocked files, so they were added to the annex by the pre-commit hook.
This commit is contained in:
parent
2fc7092095
commit
412dcb8017
4 changed files with 19 additions and 6 deletions
|
@ -12,6 +12,7 @@ module Annex.CatFile (
|
|||
catFileHandle,
|
||||
catKey,
|
||||
catKeyFile,
|
||||
catKeyFileHEAD,
|
||||
) where
|
||||
|
||||
import qualified Data.ByteString.Lazy as L
|
||||
|
@ -87,6 +88,9 @@ catKey ref = do
|
|||
-}
|
||||
catKeyFile :: FilePath -> Annex (Maybe Key)
|
||||
catKeyFile f = ifM (Annex.getState Annex.daemon)
|
||||
( catKey $ Ref $ "HEAD:./" ++ f
|
||||
( catKeyFileHEAD f
|
||||
, catKey $ Ref $ ":./" ++ f
|
||||
)
|
||||
|
||||
catKeyFileHEAD :: FilePath -> Annex (Maybe Key)
|
||||
catKeyFileHEAD f = catKey $ Ref $ "HEAD:./" ++ f
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue