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

update keys database when adjusting branches

Browse source
This commit is contained in:
Joey Hess 2016-02-29 17:27:19 -04:00
parent d7bd4d971d
commit 70e78cc53e
Failed to extract signature
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Annex/AdjustedBranch.hs
View file

@ -26,6 +26,7 @@ import Annex.CatFile
import Annex.Link import Annex.Link
import Git.HashObject import Git.HashObject
import Annex.AutoMerge import Annex.AutoMerge
import qualified Database.Keys
data Adjustment = UnlockAdjustment data Adjustment = UnlockAdjustment
deriving (Show) deriving (Show)
@ -35,8 +36,10 @@ adjustTreeItem UnlockAdjustment h ti@(TreeItem f m s)
| toBlobType m == Just SymlinkBlob = do | toBlobType m == Just SymlinkBlob = do
mk <- catKey s mk <- catKey s
case mk of case mk of
Just k -> Just . TreeItem f (fromBlobType FileBlob) Just k -> do
<$> hashPointerFile' h k Database.Keys.addAssociatedFile k f
Just . TreeItem f (fromBlobType FileBlob)
<$> hashPointerFile' h k
Nothing -> return (Just ti) Nothing -> return (Just ti)
| otherwise = return (Just ti) | otherwise = return (Just ti)