From 2610c46f0f0ea8f9c57d1e3c6f2ab81dc9719433 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 29 Feb 2016 17:27:19 -0400
Subject: update keys database when adjusting branches

---
 Annex/AdjustedBranch.hs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'Annex/AdjustedBranch.hs')

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)
 
-- 
cgit v1.2.3