diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-06-09 14:45:00 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-06-09 14:45:00 -0400 |
| commit | ab157b634f7455afbdc414b502cbfaa20c94642d (patch) | |
| tree | 3cae05a832b05ad16b69cab47f2b8562603d45be | |
| parent | 3be798cc348c0869e76c02c972126403927f4475 (diff) | |
Fix update of associated files db when unlocking a file in a v6 repo.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Command/Unlock.hs | 5 |
2 files changed, 5 insertions, 1 deletions
@@ -30,6 +30,7 @@ git-annex (6.20160528) UNRELEASED; urgency=medium sync.) * Make lock and unlock work in v6 repos on files whose content is not present. + * Fix update of associated files db when unlocking a file in a v6 repo. -- Joey Hess <id@joeyh.name> Fri, 27 May 2016 13:12:48 -0400 diff --git a/Command/Unlock.hs b/Command/Unlock.hs index 4dc02642e..dfd8350f1 100644 --- a/Command/Unlock.hs +++ b/Command/Unlock.hs @@ -1,6 +1,6 @@ {- git-annex command - - - Copyright 2010,2015 Joey Hess <id@joeyh.name> + - Copyright 2010-2016 Joey Hess <id@joeyh.name> - - Licensed under the GNU GPL version 3 or higher. -} @@ -16,6 +16,8 @@ import Annex.Link import Annex.ReplaceFile import Utility.CopyFile import Utility.FileMode +import Git.FilePath +import qualified Database.Keys cmd :: Command cmd = mkcmd "unlock" "unlock files for modification" @@ -62,6 +64,7 @@ performNew dest key = do cleanupNew :: FilePath -> Key -> Maybe FileMode -> CommandCleanup cleanupNew dest key destmode = do stagePointerFile dest destmode =<< hashPointerFile key + Database.Keys.addAssociatedFile key =<< inRepo (toTopFilePath dest) return True startOld :: FilePath -> Key -> CommandStart |