diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-04 15:46:33 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-04 15:46:33 -0400 |
| commit | a7cc06b30d3ae8a9801a68729db23dd66f8dadf6 (patch) | |
| tree | b500f785b37815cf82d82da299881e07931ab27c /Command/Fix.hs | |
| parent | 307212395c912ab268109521ceae1bf192f728d8 (diff) | |
Use lower case hash directories for storing files on crippled filesystems, same as is already done for bare repositories.
* since this is a crippled filesystem anyway, git-annex doesn't use
symlinks on it
* so there's no reason to use the mixed case hash directories that we're
stuck using to avoid breaking everyone's symlinks to the content
* so we can do what is already done for all bare repos, and make non-bare
repos on crippled filesystems use the all-lower case hash directories
* which are, happily, all 3 letters long, so they cannot conflict with
mixed case hash directories
* so I was able to 100% fix this and even resuming `git annex add` in the
test case will recover and it will all just work.
Diffstat (limited to 'Command/Fix.hs')
| -rw-r--r-- | Command/Fix.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Command/Fix.hs b/Command/Fix.hs index dbccfacdf..6aedbad6e 100644 --- a/Command/Fix.hs +++ b/Command/Fix.hs @@ -10,7 +10,6 @@ module Command.Fix where import Common.Annex import Command import qualified Annex.Queue -import Annex.Content def :: [Command] def = [notDirect $ noCommit $ command "fix" paramPaths seek @@ -22,7 +21,7 @@ seek = [withFilesInGit $ whenAnnexed start] {- Fixes the symlink to an annexed file. -} start :: FilePath -> (Key, Backend) -> CommandStart start file (key, _) = do - link <- calcGitLink file key + link <- inRepo $ gitAnnexLink file key stopUnless ((/=) (Just link) <$> liftIO (catchMaybeIO $ readSymbolicLink file)) $ do showStart "fix" file next $ perform file link |