diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-02-29 17:27:19 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-02-29 17:27:19 -0400 |
commit | 2610c46f0f0ea8f9c57d1e3c6f2ab81dc9719433 (patch) | |
tree | b01866869a2e940587c9d2b76ee410443c05cbf1 /Annex/AdjustedBranch.hs | |
parent | 186e00e2d677fa756b6f4ec042c1dfc8f005c364 (diff) |
update keys database when adjusting branches
Diffstat (limited to 'Annex/AdjustedBranch.hs')
-rw-r--r-- | Annex/AdjustedBranch.hs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Annex/AdjustedBranch.hs b/Annex/AdjustedBranch.hs index 3ff8e9265..7ab98fc6f 100644 --- a/Annex/AdjustedBranch.hs +++ b/Annex/AdjustedBranch.hs @@ -26,6 +26,7 @@ import Annex.CatFile import Annex.Link import Git.HashObject import Annex.AutoMerge +import qualified Database.Keys data Adjustment = UnlockAdjustment deriving (Show) @@ -35,8 +36,10 @@ adjustTreeItem UnlockAdjustment h ti@(TreeItem f m s) | toBlobType m == Just SymlinkBlob = do mk <- catKey s case mk of - Just k -> Just . TreeItem f (fromBlobType FileBlob) - <$> hashPointerFile' h k + Just k -> do + Database.Keys.addAssociatedFile k f + Just . TreeItem f (fromBlobType FileBlob) + <$> hashPointerFile' h k Nothing -> return (Just ti) | otherwise = return (Just ti) |