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

tweak

Browse source
This commit is contained in:
Joey Hess 2010-11-13 15:42:56 -04:00
parent dd573e7010
commit aec34ee1bd
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Core.hs
View file

@ -203,14 +203,14 @@ fromAnnex key dest = do
removeDirectory dir removeDirectory dir
{- Moves a key out of .git/annex/objects/ into .git/annex/bad, and {- Moves a key out of .git/annex/objects/ into .git/annex/bad, and
- returns the directory it was moved to. -} - returns the file it was moved to. -}
moveBad :: Key -> Annex FilePath moveBad :: Key -> Annex FilePath
moveBad key = do moveBad key = do
g <- Annex.gitRepo g <- Annex.gitRepo
let src = annexLocation g key let src = annexLocation g key
let dest = annexBadLocation g let dest = annexBadLocation g ++ takeFileName src
liftIO $ createDirectoryIfMissing True dest liftIO $ createDirectoryIfMissing True dest
liftIO $ renameFile src (dest ++ takeFileName src) liftIO $ renameFile src dest
liftIO $ removeDirectory (parentDir src) liftIO $ removeDirectory (parentDir src)
return dest return dest

2
doc/walkthrough.mdwn
View file

@ -311,7 +311,7 @@ might say about a badly messed up annex:
WORM:1289672605:3:file WORM:1289672605:3:file
failed failed
fsck my_cool_big_file (checksum..) fsck my_cool_big_file (checksum..)
Bad file content; moved to .git/annex/bad/ Bad file content; moved to .git/annex/bad/SHA1:7da006579dd64330eb2456001fd01948430572f2
** No known copies of the file exist! ** No known copies of the file exist!
failed failed
fsck important_file fsck important_file