diff options
| author |  Joey Hess <joey@kitenet.net> | 2010-11-13 15:42:56 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-11-13 15:42:56 -0400 |
| commit | aec34ee1bda9b8bcdfe54903331eae582ee32792 (patch) | |
| tree | 178a3c0ec5bdd17ead11369c9b0968f777ca262f | |
| parent | dd573e70105706bd1a769f74af9c3006dab903d0 (diff) | |
tweak
| -rw-r--r-- | Core.hs | 6 | ||||
| -rw-r--r-- | doc/walkthrough.mdwn | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -203,14 +203,14 @@ fromAnnex key dest = do removeDirectory dir {- 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 = do g <- Annex.gitRepo let src = annexLocation g key - let dest = annexBadLocation g + let dest = annexBadLocation g ++ takeFileName src liftIO $ createDirectoryIfMissing True dest - liftIO $ renameFile src (dest ++ takeFileName src) + liftIO $ renameFile src dest liftIO $ removeDirectory (parentDir src) return dest diff --git a/doc/walkthrough.mdwn b/doc/walkthrough.mdwn index 887fde48c..049dc40f6 100644 --- a/doc/walkthrough.mdwn +++ b/doc/walkthrough.mdwn @@ -311,7 +311,7 @@ might say about a badly messed up annex: WORM:1289672605:3:file failed 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! failed fsck important_file |