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

Fix update of associated files db when unlocking a file in a v6 repo.

Browse source
This commit is contained in:
Joey Hess 2016-06-09 14:45:00 -04:00
parent 0bc7fee660
commit 7fe2ecff91
Failed to extract signature
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -30,6 +30,7 @@ git-annex (6.20160528) UNRELEASED; urgency=medium
sync.) sync.)
* Make lock and unlock work in v6 repos on files whose content is not * Make lock and unlock work in v6 repos on files whose content is not
present. 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 -- Joey Hess <id@joeyh.name> Fri, 27 May 2016 13:12:48 -0400

5
Command/Unlock.hs
View file

@ -1,6 +1,6 @@
{- git-annex command {- 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. - Licensed under the GNU GPL version 3 or higher.
-} -}
@ -16,6 +16,8 @@ import Annex.Link
import Annex.ReplaceFile import Annex.ReplaceFile
import Utility.CopyFile import Utility.CopyFile
import Utility.FileMode import Utility.FileMode
import Git.FilePath
import qualified Database.Keys
cmd :: Command cmd :: Command
cmd = mkcmd "unlock" "unlock files for modification" cmd = mkcmd "unlock" "unlock files for modification"
@ -62,6 +64,7 @@ performNew dest key = do
cleanupNew :: FilePath -> Key -> Maybe FileMode -> CommandCleanup cleanupNew :: FilePath -> Key -> Maybe FileMode -> CommandCleanup
cleanupNew dest key destmode = do cleanupNew dest key destmode = do
stagePointerFile dest destmode =<< hashPointerFile key stagePointerFile dest destmode =<< hashPointerFile key
Database.Keys.addAssociatedFile key =<< inRepo (toTopFilePath dest)
return True return True
startOld :: FilePath -> Key -> CommandStart startOld :: FilePath -> Key -> CommandStart